From e936d246576e8bf714dbf8666e9349a5f22be87e Mon Sep 17 00:00:00 2001 From: Runxi Yu Date: Sat, 21 Feb 2026 01:47:11 +0800 Subject: objectstore: Rename from objectdb --- objectdb/chain/chain.go | 128 --------------------------------------------- objectdb/objectdb.go | 33 ------------ objectstore/chain/chain.go | 128 +++++++++++++++++++++++++++++++++++++++++++++ objectstore/objectstore.go | 33 ++++++++++++ 4 files changed, 161 insertions(+), 161 deletions(-) delete mode 100644 objectdb/chain/chain.go delete mode 100644 objectdb/objectdb.go create mode 100644 objectstore/chain/chain.go create mode 100644 objectstore/objectstore.go diff --git a/objectdb/chain/chain.go b/objectdb/chain/chain.go deleted file mode 100644 index 1b4678d4..00000000 --- a/objectdb/chain/chain.go +++ /dev/null @@ -1,128 +0,0 @@ -// Package chain provides an ordered object database chain implementation. -package chain - -import ( - "errors" - "fmt" - "io" - - "codeberg.org/lindenii/furgit/objectdb" - "codeberg.org/lindenii/furgit/objectid" - "codeberg.org/lindenii/furgit/objecttype" -) - -// Chain queries multiple object databases in order. -type Chain struct { - backends []objectdb.ObjectDB -} - -// New creates an ordered object database chain. -func New(backends ...objectdb.ObjectDB) *Chain { - return &Chain{ - backends: append([]objectdb.ObjectDB(nil), backends...), - } -} - -// ReadBytesFull reads a full serialized object from the first backend that has it. -func (chain *Chain) ReadBytesFull(id objectid.ObjectID) ([]byte, error) { - for i, backend := range chain.backends { - if backend == nil { - continue - } - full, err := backend.ReadBytesFull(id) - if err == nil { - return full, nil - } - if errors.Is(err, objectdb.ErrObjectNotFound) { - continue - } - return nil, fmt.Errorf("objectdb: backend %d read bytes full: %w", i, err) - } - return nil, objectdb.ErrObjectNotFound -} - -// ReadBytesContent reads an object's type and content bytes from the first backend that has it. -func (chain *Chain) ReadBytesContent(id objectid.ObjectID) (objecttype.Type, []byte, error) { - for i, backend := range chain.backends { - if backend == nil { - continue - } - ty, content, err := backend.ReadBytesContent(id) - if err == nil { - return ty, content, nil - } - if errors.Is(err, objectdb.ErrObjectNotFound) { - continue - } - return objecttype.TypeInvalid, nil, fmt.Errorf("objectdb: backend %d read bytes content: %w", i, err) - } - return objecttype.TypeInvalid, nil, objectdb.ErrObjectNotFound -} - -// ReadReaderFull reads a full serialized object stream from the first backend that has it. -func (chain *Chain) ReadReaderFull(id objectid.ObjectID) (io.ReadCloser, error) { - for i, backend := range chain.backends { - if backend == nil { - continue - } - reader, err := backend.ReadReaderFull(id) - if err == nil { - return reader, nil - } - if errors.Is(err, objectdb.ErrObjectNotFound) { - continue - } - return nil, fmt.Errorf("objectdb: backend %d read reader full: %w", i, err) - } - return nil, objectdb.ErrObjectNotFound -} - -// ReadReaderContent reads an object's type and content stream from the first backend that has it. -func (chain *Chain) ReadReaderContent(id objectid.ObjectID) (objecttype.Type, io.ReadCloser, error) { - for i, backend := range chain.backends { - if backend == nil { - continue - } - ty, reader, err := backend.ReadReaderContent(id) - if err == nil { - return ty, reader, nil - } - if errors.Is(err, objectdb.ErrObjectNotFound) { - continue - } - return objecttype.TypeInvalid, nil, fmt.Errorf("objectdb: backend %d read reader content: %w", i, err) - } - return objecttype.TypeInvalid, nil, objectdb.ErrObjectNotFound -} - -// ReadHeader reads object header data from the first backend that has it. -func (chain *Chain) ReadHeader(id objectid.ObjectID) (objecttype.Type, int64, error) { - for i, backend := range chain.backends { - if backend == nil { - continue - } - ty, size, err := backend.ReadHeader(id) - if err == nil { - return ty, size, nil - } - if errors.Is(err, objectdb.ErrObjectNotFound) { - continue - } - return objecttype.TypeInvalid, 0, fmt.Errorf("objectdb: backend %d read header: %w", i, err) - } - return objecttype.TypeInvalid, 0, objectdb.ErrObjectNotFound -} - -// Close closes all backends and joins close errors. -func (chain *Chain) Close() error { - var errs []error - for _, backend := range chain.backends { - if backend == nil { - continue - } - if err := backend.Close(); err != nil { - errs = append(errs, err) - } - } - return errors.Join(errs...) -} diff --git a/objectdb/objectdb.go b/objectdb/objectdb.go deleted file mode 100644 index 6e1fbded..00000000 --- a/objectdb/objectdb.go +++ /dev/null @@ -1,33 +0,0 @@ -// Package objectdb provides storage interfaces for Git objects. -package objectdb - -import ( - "errors" - "io" - - "codeberg.org/lindenii/furgit/objectid" - "codeberg.org/lindenii/furgit/objecttype" -) - -// ErrObjectNotFound indicates that an object does not exist in a backend. -// TODO: This might need to be an interface or otherwise be able to encapsulate multiple concrete backends' -var ErrObjectNotFound = errors.New("objectdb: object not found") - -// ObjectDB reads Git objects by object ID. -type ObjectDB interface { - // ReadBytesFull reads a full serialized object as "type size\\x00content". - // If hashed with the same algorithm it MUST match the object ID. - ReadBytesFull(id objectid.ObjectID) ([]byte, error) - // ReadBytesContent reads an object's type and content bytes. - ReadBytesContent(id objectid.ObjectID) (objecttype.Type, []byte, error) - // ReadReaderFull reads a full serialized object stream as "type size\\x00content". - // Caller must close the returned reader. - ReadReaderFull(id objectid.ObjectID) (io.ReadCloser, error) - // ReadReaderContent reads an object's type and content stream. - // Caller must close the returned reader. - ReadReaderContent(id objectid.ObjectID) (objecttype.Type, io.ReadCloser, error) - // ReadHeader reads an object's type and declared content length. - ReadHeader(id objectid.ObjectID) (objecttype.Type, int64, error) - // Close releases resources associated with the backend. - Close() error -} diff --git a/objectstore/chain/chain.go b/objectstore/chain/chain.go new file mode 100644 index 00000000..f11e3f67 --- /dev/null +++ b/objectstore/chain/chain.go @@ -0,0 +1,128 @@ +// Package chain provides an ordered object database chain implementation. +package chain + +import ( + "errors" + "fmt" + "io" + + "codeberg.org/lindenii/furgit/objectid" + "codeberg.org/lindenii/furgit/objectstore" + "codeberg.org/lindenii/furgit/objecttype" +) + +// Chain queries multiple object databases in order. +type Chain struct { + backends []objectstore.ObjectStore +} + +// New creates an ordered object database chain. +func New(backends ...objectstore.ObjectStore) *Chain { + return &Chain{ + backends: append([]objectstore.ObjectStore(nil), backends...), + } +} + +// ReadBytesFull reads a full serialized object from the first backend that has it. +func (chain *Chain) ReadBytesFull(id objectid.ObjectID) ([]byte, error) { + for i, backend := range chain.backends { + if backend == nil { + continue + } + full, err := backend.ReadBytesFull(id) + if err == nil { + return full, nil + } + if errors.Is(err, objectstore.ErrObjectNotFound) { + continue + } + return nil, fmt.Errorf("objectstore: backend %d read bytes full: %w", i, err) + } + return nil, objectstore.ErrObjectNotFound +} + +// ReadBytesContent reads an object's type and content bytes from the first backend that has it. +func (chain *Chain) ReadBytesContent(id objectid.ObjectID) (objecttype.Type, []byte, error) { + for i, backend := range chain.backends { + if backend == nil { + continue + } + ty, content, err := backend.ReadBytesContent(id) + if err == nil { + return ty, content, nil + } + if errors.Is(err, objectstore.ErrObjectNotFound) { + continue + } + return objecttype.TypeInvalid, nil, fmt.Errorf("objectstore: backend %d read bytes content: %w", i, err) + } + return objecttype.TypeInvalid, nil, objectstore.ErrObjectNotFound +} + +// ReadReaderFull reads a full serialized object stream from the first backend that has it. +func (chain *Chain) ReadReaderFull(id objectid.ObjectID) (io.ReadCloser, error) { + for i, backend := range chain.backends { + if backend == nil { + continue + } + reader, err := backend.ReadReaderFull(id) + if err == nil { + return reader, nil + } + if errors.Is(err, objectstore.ErrObjectNotFound) { + continue + } + return nil, fmt.Errorf("objectstore: backend %d read reader full: %w", i, err) + } + return nil, objectstore.ErrObjectNotFound +} + +// ReadReaderContent reads an object's type and content stream from the first backend that has it. +func (chain *Chain) ReadReaderContent(id objectid.ObjectID) (objecttype.Type, io.ReadCloser, error) { + for i, backend := range chain.backends { + if backend == nil { + continue + } + ty, reader, err := backend.ReadReaderContent(id) + if err == nil { + return ty, reader, nil + } + if errors.Is(err, objectstore.ErrObjectNotFound) { + continue + } + return objecttype.TypeInvalid, nil, fmt.Errorf("objectstore: backend %d read reader content: %w", i, err) + } + return objecttype.TypeInvalid, nil, objectstore.ErrObjectNotFound +} + +// ReadHeader reads object header data from the first backend that has it. +func (chain *Chain) ReadHeader(id objectid.ObjectID) (objecttype.Type, int64, error) { + for i, backend := range chain.backends { + if backend == nil { + continue + } + ty, size, err := backend.ReadHeader(id) + if err == nil { + return ty, size, nil + } + if errors.Is(err, objectstore.ErrObjectNotFound) { + continue + } + return objecttype.TypeInvalid, 0, fmt.Errorf("objectstore: backend %d read header: %w", i, err) + } + return objecttype.TypeInvalid, 0, objectstore.ErrObjectNotFound +} + +// Close closes all backends and joins close errors. +func (chain *Chain) Close() error { + var errs []error + for _, backend := range chain.backends { + if backend == nil { + continue + } + if err := backend.Close(); err != nil { + errs = append(errs, err) + } + } + return errors.Join(errs...) +} diff --git a/objectstore/objectstore.go b/objectstore/objectstore.go new file mode 100644 index 00000000..ea906c70 --- /dev/null +++ b/objectstore/objectstore.go @@ -0,0 +1,33 @@ +// Package objectstore provides storage interfaces for Git objects. +package objectstore + +import ( + "errors" + "io" + + "codeberg.org/lindenii/furgit/objectid" + "codeberg.org/lindenii/furgit/objecttype" +) + +// ErrObjectNotFound indicates that an object does not exist in a backend. +// TODO: This might need to be an interface or otherwise be able to encapsulate multiple concrete backends' +var ErrObjectNotFound = errors.New("objectstore: object not found") + +// ObjectStore reads Git objects by object ID. +type ObjectStore interface { + // ReadBytesFull reads a full serialized object as "type size\\x00content". + // If hashed with the same algorithm it MUST match the object ID. + ReadBytesFull(id objectid.ObjectID) ([]byte, error) + // ReadBytesContent reads an object's type and content bytes. + ReadBytesContent(id objectid.ObjectID) (objecttype.Type, []byte, error) + // ReadReaderFull reads a full serialized object stream as "type size\\x00content". + // Caller must close the returned reader. + ReadReaderFull(id objectid.ObjectID) (io.ReadCloser, error) + // ReadReaderContent reads an object's type and content stream. + // Caller must close the returned reader. + ReadReaderContent(id objectid.ObjectID) (objecttype.Type, io.ReadCloser, error) + // ReadHeader reads an object's type and declared content length. + ReadHeader(id objectid.ObjectID) (objecttype.Type, int64, error) + // Close releases resources associated with the backend. + Close() error +} -- cgit v1.3.1-10-gc9f91