Merge pull request #741 from owncloud/implement-index-lowerbound

Lower Bound on CS3 Index
owncloud · Oct 23, 2020 · 7f1b58d · 7f1b58d
2 parents fd048c7 + a8429bd
commit 7f1b58d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/accounts/pkg/indexer/index/cs3/autoincrement.go b/accounts/pkg/indexer/index/cs3/autoincrement.go
@@ -41,6 +41,7 @@ type Autoincrement struct {
 	dataProvider    dataProviderClient // Used to create and download data via http, bypassing reva upload protocol
 
 	cs3conf *Config
+	bound   *option.Bound
 }
 
 func init() {
@@ -58,6 +59,7 @@ func NewAutoincrementIndex(o ...option.Option) index.Index {
 		indexBy:      opts.IndexBy,
 		typeName:     opts.TypeName,
 		filesDir:     opts.FilesDir,
+		bound:        opts.Bound,
 		indexBaseDir: path.Join(opts.DataDir, "index.cs3"),
 		indexRootDir: path.Join(path.Join(opts.DataDir, "index.cs3"), strings.Join([]string{"autoincrement", opts.TypeName, opts.IndexBy}, ".")),
 		cs3conf: &Config{
@@ -356,5 +358,10 @@ func (idx *Autoincrement) next() (int, error) {
 	if err != nil {
 		return -1, err
 	}
+
+	if int64(latest) < idx.bound.Lower {
+		return int(idx.bound.Lower), nil
+	}
+
 	return latest + 1, nil
 }
diff --git a/changelog/unreleased/cs3-index-lowerbound.md b/changelog/unreleased/cs3-index-lowerbound.md
@@ -0,0 +1,7 @@
+Bugfix: Lower Bound was not working for the cs3 api index implementation
+
+Tags: accounts
+
+Lower bound working on the cs3 index implementation
+
+https://github.com/owncloud/ocis/pull/741