aboutsummaryrefslogtreecommitdiff
path: root/object/store/mix
diff options
context:
space:
mode:
Diffstat (limited to 'object/store/mix')
-rw-r--r--object/store/mix/bytes.go4
-rw-r--r--object/store/mix/header.go8
-rw-r--r--object/store/mix/mix.go2
-rw-r--r--object/store/mix/reader.go6
4 files changed, 10 insertions, 10 deletions
diff --git a/object/store/mix/bytes.go b/object/store/mix/bytes.go
index 2b4d3819..e76d16a9 100644
--- a/object/store/mix/bytes.go
+++ b/object/store/mix/bytes.go
@@ -45,8 +45,8 @@ func (mix *Mix) ReadBytesContent(id id.ObjectID) (typ.Type, []byte, error) {
continue
}
- return typ.TypeUnknown, nil, fmt.Errorf("object/store/mix: read bytes content: %w", err)
+ return typ.Unknown, nil, fmt.Errorf("object/store/mix: read bytes content: %w", err)
}
- return typ.TypeUnknown, nil, store.ErrObjectNotFound
+ return typ.Unknown, nil, store.ErrObjectNotFound
}
diff --git a/object/store/mix/header.go b/object/store/mix/header.go
index 13dda9af..aefa2907 100644
--- a/object/store/mix/header.go
+++ b/object/store/mix/header.go
@@ -11,7 +11,7 @@ import (
// ReadHeader reads object header data
// from the most-recently-used backend that has it.
-func (mix *Mix) ReadHeader(id id.ObjectID) (typ.Type, uint64, error) {
+func (mix *Mix) ReadHeader(id id.ObjectID) (typ.Type, int, error) {
for _, backend := range mix.order.Keys() {
ty, size, err := backend.ReadHeader(id)
if err == nil {
@@ -24,15 +24,15 @@ func (mix *Mix) ReadHeader(id id.ObjectID) (typ.Type, uint64, error) {
continue
}
- return typ.TypeUnknown, 0, fmt.Errorf("object/store/mix: read header: %w", err)
+ return typ.Unknown, 0, fmt.Errorf("object/store/mix: read header: %w", err)
}
- return typ.TypeUnknown, 0, store.ErrObjectNotFound
+ return typ.Unknown, 0, store.ErrObjectNotFound
}
// ReadSize reads object content length
// from the most-recently-used backend that has it.
-func (mix *Mix) ReadSize(id id.ObjectID) (uint64, error) {
+func (mix *Mix) ReadSize(id id.ObjectID) (int, error) {
for _, backend := range mix.order.Keys() {
size, err := backend.ReadSize(id)
if err == nil {
diff --git a/object/store/mix/mix.go b/object/store/mix/mix.go
index 2e8e926b..b048fe86 100644
--- a/object/store/mix/mix.go
+++ b/object/store/mix/mix.go
@@ -28,7 +28,7 @@ func New(backends ...store.ObjectReader) *Mix {
present[backend] = struct{}{}
}
- order := mru.New[store.ObjectReader]()
+ order := mru.New[store.ObjectReader](mru.Options{Interval: 48})
order.Sync(present)
return &Mix{
diff --git a/object/store/mix/reader.go b/object/store/mix/reader.go
index f9edc1a4..46a3aedf 100644
--- a/object/store/mix/reader.go
+++ b/object/store/mix/reader.go
@@ -33,7 +33,7 @@ func (mix *Mix) ReadReaderFull(id id.ObjectID) (io.ReadCloser, error) {
// ReadReaderContent reads an object's type, declared content length,
// and content stream from the most-recently-used backend that has it.
-func (mix *Mix) ReadReaderContent(id id.ObjectID) (typ.Type, uint64, io.ReadCloser, error) {
+func (mix *Mix) ReadReaderContent(id id.ObjectID) (typ.Type, int, io.ReadCloser, error) {
for _, backend := range mix.order.Keys() {
ty, size, reader, err := backend.ReadReaderContent(id)
if err == nil {
@@ -46,8 +46,8 @@ func (mix *Mix) ReadReaderContent(id id.ObjectID) (typ.Type, uint64, io.ReadClos
continue
}
- return typ.TypeUnknown, 0, nil, fmt.Errorf("object/store/mix: read reader content: %w", err)
+ return typ.Unknown, 0, nil, fmt.Errorf("object/store/mix: read reader content: %w", err)
}
- return typ.TypeUnknown, 0, nil, store.ErrObjectNotFound
+ return typ.Unknown, 0, nil, store.ErrObjectNotFound
}