*: objectstore -> object/store

9 files changed, 0 insertions, 334 deletions

diff --git a/objectstore/mix/bytes.go b/objectstore/mix/bytes.go
deleted file mode 100644
index fcd7b058..00000000
--- a/objectstore/mix/bytes.go
+++ /dev/null
@@ -1,51 +0,0 @@
-package mix
-
-import (
-	"errors"
-	"fmt"
-
-	objectid "codeberg.org/lindenii/furgit/object/id"
-	objecttype "codeberg.org/lindenii/furgit/object/type"
-	"codeberg.org/lindenii/furgit/objectstore"
-)
-
-// ReadBytesFull reads a full serialized object from one backend that has it.
-func (mix *Mix) ReadBytesFull(id objectid.ObjectID) ([]byte, error) {
-	for i, backend := 0, mix.firstBackend(); backend != nil; i, backend = i+1, mix.nextBackend(backend) {
-		full, err := backend.ReadBytesFull(id)
-		if err == nil {
-			mix.touchBackend(backend)
-
-			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 one backend
-// that has it.
-func (mix *Mix) ReadBytesContent(id objectid.ObjectID) (objecttype.Type, []byte, error) {
-	for i, backend := 0, mix.firstBackend(); backend != nil; i, backend = i+1, mix.nextBackend(backend) {
-		ty, content, err := backend.ReadBytesContent(id)
-		if err == nil {
-			mix.touchBackend(backend)
-
-			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
-}
diff --git a/objectstore/mix/close.go b/objectstore/mix/close.go
deleted file mode 100644
index 53f6cd30..00000000
--- a/objectstore/mix/close.go
+++ /dev/null
@@ -1,8 +0,0 @@
-package mix
-
-// Close releases wrapper-local resources.
-//
-// Mix borrows its backends, so Close does not close them.
-//
-// Repeated calls to Close are undefined behavior.
-func (mix *Mix) Close() error { return nil }
diff --git a/objectstore/mix/header.go b/objectstore/mix/header.go
deleted file mode 100644
index 5cc17c81..00000000
--- a/objectstore/mix/header.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package mix
-
-import (
-	"errors"
-	"fmt"
-
-	objectid "codeberg.org/lindenii/furgit/object/id"
-	objecttype "codeberg.org/lindenii/furgit/object/type"
-	"codeberg.org/lindenii/furgit/objectstore"
-)
-
-// ReadHeader reads object header data from one backend that has it.
-func (mix *Mix) ReadHeader(id objectid.ObjectID) (objecttype.Type, int64, error) {
-	for i, backend := 0, mix.firstBackend(); backend != nil; i, backend = i+1, mix.nextBackend(backend) {
-		ty, size, err := backend.ReadHeader(id)
-		if err == nil {
-			mix.touchBackend(backend)
-
-			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
-}
diff --git a/objectstore/mix/mix.go b/objectstore/mix/mix.go
deleted file mode 100644
index ef381b95..00000000
--- a/objectstore/mix/mix.go
+++ /dev/null
@@ -1,20 +0,0 @@
-// Package mix provides an adaptive wrapper over multiple object storage
-// backends.
-package mix
-
-import (
-	"sync"
-
-	"codeberg.org/lindenii/furgit/objectstore"
-)
-
-// Mix queries multiple object databases with an MRU backend preference.
-//
-// Mix borrows its backend stores.
-type Mix struct {
-	mu sync.RWMutex
-
-	backendHead        *backendNode
-	backendTail        *backendNode
-	backendNodeByStore map[objectstore.Store]*backendNode
-}
diff --git a/objectstore/mix/mru.go b/objectstore/mix/mru.go
deleted file mode 100644
index 52176cab..00000000
--- a/objectstore/mix/mru.go
+++ /dev/null
@@ -1,74 +0,0 @@
-package mix
-
-import "codeberg.org/lindenii/furgit/objectstore"
-
-type backendNode struct {
-	backend objectstore.Store
-	prev    *backendNode
-	next    *backendNode
-}
-
-//nolint:ireturn
-func (mix *Mix) firstBackend() objectstore.Store {
-	mix.mu.RLock()
-	defer mix.mu.RUnlock()
-
-	if mix.backendHead == nil {
-		return nil
-	}
-
-	return mix.backendHead.backend
-}
-
-//nolint:ireturn
-func (mix *Mix) nextBackend(current objectstore.Store) objectstore.Store {
-	mix.mu.RLock()
-	defer mix.mu.RUnlock()
-
-	node := mix.backendNodeByStore[current]
-	if node == nil || node.next == nil {
-		return nil
-	}
-
-	return node.next.backend
-}
-
-func (mix *Mix) touchBackend(backend objectstore.Store) {
-	if backend == nil {
-		return
-	}
-
-	if !mix.mu.TryLock() {
-		return
-	}
-	defer mix.mu.Unlock()
-
-	node := mix.backendNodeByStore[backend]
-	if node == nil || node == mix.backendHead {
-		return
-	}
-
-	if node.prev != nil {
-		node.prev.next = node.next
-	}
-
-	if node.next != nil {
-		node.next.prev = node.prev
-	}
-
-	if mix.backendTail == node {
-		mix.backendTail = node.prev
-	}
-
-	node.prev = nil
-
-	node.next = mix.backendHead
-	if mix.backendHead != nil {
-		mix.backendHead.prev = node
-	}
-
-	mix.backendHead = node
-	if mix.backendTail == nil {
-		mix.backendTail = node
-	}
-}
diff --git a/objectstore/mix/new.go b/objectstore/mix/new.go
deleted file mode 100644
index 16c6c9eb..00000000
--- a/objectstore/mix/new.go
+++ /dev/null
@@ -1,39 +0,0 @@
-package mix
-
-import "codeberg.org/lindenii/furgit/objectstore"
-
-// New creates a Mix from backends.
-//
-// The provided backends must be non-nil and distinct.
-// Mix borrows the provided backends and does not close them in Close.
-func New(backends ...objectstore.Store) *Mix {
-	nodeByStore := make(map[objectstore.Store]*backendNode, len(backends))
-
-	var (
-		head *backendNode
-		tail *backendNode
-	)
-
-	for _, backend := range backends {
-		node := &backendNode{
-			backend: backend,
-			prev:    tail,
-		}
-		if tail != nil {
-			tail.next = node
-		}
-
-		if head == nil {
-			head = node
-		}
-
-		tail = node
-		nodeByStore[backend] = node
-	}
-
-	return &Mix{
-		backendHead:        head,
-		backendTail:        tail,
-		backendNodeByStore: nodeByStore,
-	}
-}
diff --git a/objectstore/mix/reader.go b/objectstore/mix/reader.go
deleted file mode 100644
index 1d569ee1..00000000
--- a/objectstore/mix/reader.go
+++ /dev/null
@@ -1,53 +0,0 @@
-package mix
-
-import (
-	"errors"
-	"fmt"
-	"io"
-
-	objectid "codeberg.org/lindenii/furgit/object/id"
-	objecttype "codeberg.org/lindenii/furgit/object/type"
-	"codeberg.org/lindenii/furgit/objectstore"
-)
-
-// ReadReaderFull reads a full serialized object stream from one backend that
-// has it.
-func (mix *Mix) ReadReaderFull(id objectid.ObjectID) (io.ReadCloser, error) {
-	for i, backend := 0, mix.firstBackend(); backend != nil; i, backend = i+1, mix.nextBackend(backend) {
-		reader, err := backend.ReadReaderFull(id)
-		if err == nil {
-			mix.touchBackend(backend)
-
-			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, declared content length, and
-// content stream from one backend that has it.
-func (mix *Mix) ReadReaderContent(id objectid.ObjectID) (objecttype.Type, int64, io.ReadCloser, error) {
-	for i, backend := 0, mix.firstBackend(); backend != nil; i, backend = i+1, mix.nextBackend(backend) {
-		ty, size, reader, err := backend.ReadReaderContent(id)
-		if err == nil {
-			mix.touchBackend(backend)
-
-			return ty, size, reader, nil
-		}
-
-		if errors.Is(err, objectstore.ErrObjectNotFound) {
-			continue
-		}
-
-		return objecttype.TypeInvalid, 0, nil, fmt.Errorf("objectstore: backend %d read reader content: %w", i, err)
-	}
-
-	return objecttype.TypeInvalid, 0, nil, objectstore.ErrObjectNotFound
-}
diff --git a/objectstore/mix/refresh.go b/objectstore/mix/refresh.go
deleted file mode 100644
index a9418a62..00000000
--- a/objectstore/mix/refresh.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package mix
-
-import (
-	"errors"
-
-	"codeberg.org/lindenii/furgit/objectstore"
-)
-
-// Refresh forwards refresh calls to refresh-capable backends.
-func (mix *Mix) Refresh() error {
-	mix.mu.RLock()
-
-	backends := make([]objectstore.Store, 0, len(mix.backendNodeByStore))
-	for node := mix.backendHead; node != nil; node = node.next {
-		backends = append(backends, node.backend)
-	}
-
-	mix.mu.RUnlock()
-
-	var errs []error
-
-	for _, backend := range backends {
-		err := backend.Refresh()
-		if err != nil {
-			errs = append(errs, err)
-		}
-	}
-
-	return errors.Join(errs...)
-}
diff --git a/objectstore/mix/size.go b/objectstore/mix/size.go
deleted file mode 100644
index 76f39fa7..00000000
--- a/objectstore/mix/size.go
+++ /dev/null
@@ -1,29 +0,0 @@
-package mix
-
-import (
-	"errors"
-	"fmt"
-
-	objectid "codeberg.org/lindenii/furgit/object/id"
-	"codeberg.org/lindenii/furgit/objectstore"
-)
-
-// ReadSize reads object content length from one backend that has it.
-func (mix *Mix) ReadSize(id objectid.ObjectID) (int64, error) {
-	for i, backend := 0, mix.firstBackend(); backend != nil; i, backend = i+1, mix.nextBackend(backend) {
-		size, err := backend.ReadSize(id)
-		if err == nil {
-			mix.touchBackend(backend)
-
-			return size, nil
-		}
-
-		if errors.Is(err, objectstore.ErrObjectNotFound) {
-			continue
-		}
-
-		return 0, fmt.Errorf("objectstore: backend %d read size: %w", i, err)
-	}
-
-	return 0, objectstore.ErrObjectNotFound
-}