mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-01-31 17:31:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

Refactor delete into helper

Browse Source
This commit is contained in:
Benedikt Kulmann
2020-10-23 16:51:53 +02:00
parent ed5cb9d610
commit 2b76accc42
5 changed files with 36 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
accounts/pkg/indexer/index/cs3/autoincrement.go
View File

@@ -15,7 +15,6 @@ import (
idxerrs "github.com/owncloud/ocis/accounts/pkg/indexer/errors"
user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1"
rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1"
v1beta11 "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1"
provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1"
"github.com/cs3org/reva/pkg/rgrpc/todo/pool"
@@ -403,17 +402,5 @@ func (idx *Autoincrement) Delete() error {
return err
}
res, err := idx.storageProvider.Delete(ctx, &provider.DeleteRequest{
Ref: &provider.Reference{
Spec: &provider.Reference_Path{Path: path.Join("/meta", idx.indexRootDir)},
},
})
if err != nil {
return err
}
if res.Status.Code != rpc.Code_CODE_OK {
return fmt.Errorf("error deleting index root dir: %v", idx.indexRootDir)
}
return nil
return deleteIndexRoot(ctx, idx.storageProvider, idx.indexRootDir)
}

26
accounts/pkg/indexer/index/cs3/helper.go Normal file
View File

@@ -0,0 +1,26 @@
package cs3
import (
"context"
"fmt"
"path"
rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1"
provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1"
)
func deleteIndexRoot(ctx context.Context, storageProvider provider.ProviderAPIClient, indexRootDir string) error {
res, err := storageProvider.Delete(ctx, &provider.DeleteRequest{
Ref: &provider.Reference{
Spec: &provider.Reference_Path{Path: path.Join("/meta", indexRootDir)},
},
})
if err != nil {
return err
}
if res.Status.Code != rpc.Code_CODE_OK {
return fmt.Errorf("error deleting index root dir: %v", indexRootDir)
}
return nil
}

16
accounts/pkg/indexer/index/cs3/non_unique.go
View File

@@ -10,8 +10,6 @@ import (
"path/filepath"
"strings"
rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1"
user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1"
v1beta11 "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1"
provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1"
@@ -418,17 +416,5 @@ func (idx *NonUnique) Delete() error {
return err
}
res, err := idx.storageProvider.Delete(ctx, &provider.DeleteRequest{
Ref: &provider.Reference{
Spec: &provider.Reference_Path{Path: path.Join("/meta", idx.indexRootDir)},
},
})
if err != nil {
return err
}
if res.Status.Code != rpc.Code_CODE_OK {
return fmt.Errorf("error deleting index root dir: %v", idx.indexRootDir)
}
return nil
return deleteIndexRoot(ctx, idx.storageProvider, idx.indexRootDir)
}

15
accounts/pkg/indexer/index/cs3/unique.go
View File

@@ -11,7 +11,6 @@ import (
"strings"
user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1"
rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1"
v1beta11 "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1"
provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1"
"github.com/cs3org/reva/pkg/rgrpc/todo/pool"
@@ -388,17 +387,5 @@ func (idx *Unique) Delete() error {
return err
}
res, err := idx.storageProvider.Delete(ctx, &provider.DeleteRequest{
Ref: &provider.Reference{
Spec: &provider.Reference_Path{Path: path.Join("/meta", idx.indexRootDir)},
},
})
if err != nil {
return err
}
if res.Status.Code != rpc.Code_CODE_OK {
return fmt.Errorf("error deleting index root dir: %v", idx.indexRootDir)
}
return nil
return deleteIndexRoot(ctx, idx.storageProvider, idx.indexRootDir)
}

7
changelog/unreleased/accounts-index-rebuild.md Normal file
View File

@@ -0,0 +1,7 @@
Change: Rebuild index command for accounts
Tags: accounts
The index for the accounts service can now be rebuilt by running the cli command `./bin/ocis accounts rebuild`. It deletes all configured indices and rebuilds them from the documents found on storage.
https://github.com/owncloud/ocis/pull/748