dstepanov-yadro/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#760] metabase: Support COMMON_PREFIX matchtype

Browse source 
Signed-off-by: Pavel Karpy <carpawell@nspcc.ru>
This commit is contained in:
Pavel Karpy 2021-08-18 10:26:14 +03:00 committed by Alex Vanin
parent 27f0758650
commit 4ff98a7e2b
3 changed files with 64 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkg/local_object_storage/metabase/db.go
View file

@ -6,6 +6,7 @@ import (
"io/fs" "io/fs"
"os" "os"
"strconv" "strconv"
"strings"
"github.com/nspcc-dev/neofs-api-go/pkg/object" "github.com/nspcc-dev/neofs-api-go/pkg/object"
v2object "github.com/nspcc-dev/neofs-api-go/v2/object" v2object "github.com/nspcc-dev/neofs-api-go/v2/object"
@ -58,6 +59,7 @@ func New(opts ...Option) *DB {
object.MatchUnknown: unknownMatcher, object.MatchUnknown: unknownMatcher,
object.MatchStringEqual: stringEqualMatcher, object.MatchStringEqual: stringEqualMatcher,
object.MatchStringNotEqual: stringNotEqualMatcher, object.MatchStringNotEqual: stringNotEqualMatcher,
object.MatchCommonPrefix: stringCommonPrefixMatcher,
}, },
} }
} }
@ -81,6 +83,10 @@ func stringNotEqualMatcher(key string, objVal []byte, filterVal string) bool {
return stringifyValue(key, objVal) != filterVal return stringifyValue(key, objVal) != filterVal
} }
func stringCommonPrefixMatcher(key string, objVal []byte, filterVal string) bool {
return strings.HasPrefix(stringifyValue(key, objVal), filterVal)
}
func unknownMatcher(_ string, _ []byte, _ string) bool { func unknownMatcher(_ string, _ []byte, _ string) bool {
return false return false
} }

6
pkg/local_object_storage/metabase/select.go
View file

@ -258,6 +258,12 @@ func bucketNamesForType(cid *cid.ID, mType object.SearchMatchType, typeVal strin
} }
case object.MatchStringEqual: case object.MatchStringEqual:
appendNames(typeVal) appendNames(typeVal)
case object.MatchCommonPrefix:
for key := range mBucketNaming {
if strings.HasPrefix(key, typeVal) {
appendNames(key)
}
}
} }
return return

54
pkg/local_object_storage/metabase/select_test.go
View file

@ -38,6 +38,24 @@ func TestDB_SelectUserAttributes(t *testing.T) {
err = putBig(db, raw3.Object()) err = putBig(db, raw3.Object())
require.NoError(t, err) require.NoError(t, err)
raw4 := generateRawObjectWithCID(t, cid)
addAttribute(raw4, "path", "test/1/2")
err = putBig(db, raw4.Object())
require.NoError(t, err)
raw5 := generateRawObjectWithCID(t, cid)
addAttribute(raw5, "path", "test/1/3")
err = putBig(db, raw5.Object())
require.NoError(t, err)
raw6 := generateRawObjectWithCID(t, cid)
addAttribute(raw6, "path", "test/2/3")
err = putBig(db, raw6.Object())
require.NoError(t, err)
fs := objectSDK.SearchFilters{} fs := objectSDK.SearchFilters{}
fs.AddFilter("foo", "bar", objectSDK.MatchStringEqual) fs.AddFilter("foo", "bar", objectSDK.MatchStringEqual)
testSelect(t, db, cid, fs, testSelect(t, db, cid, fs,
@ -63,17 +81,31 @@ func TestDB_SelectUserAttributes(t *testing.T) {
fs = objectSDK.SearchFilters{} fs = objectSDK.SearchFilters{}
fs.AddFilter("foo", "", objectSDK.MatchNotPresent) fs.AddFilter("foo", "", objectSDK.MatchNotPresent)
testSelect(t, db, cid, fs, raw3.Object().Address()) testSelect(t, db, cid, fs,
raw3.Object().Address(),
raw4.Object().Address(),
raw5.Object().Address(),
raw6.Object().Address(),
)
fs = objectSDK.SearchFilters{} fs = objectSDK.SearchFilters{}
fs.AddFilter("a", "", objectSDK.MatchNotPresent) fs.AddFilter("a", "", objectSDK.MatchNotPresent)
testSelect(t, db, cid, fs, raw1.Object().Address(), raw2.Object().Address()) testSelect(t, db, cid, fs,
raw1.Object().Address(),
raw2.Object().Address(),
raw4.Object().Address(),
raw5.Object().Address(),
raw6.Object().Address(),
)
fs = objectSDK.SearchFilters{} fs = objectSDK.SearchFilters{}
testSelect(t, db, cid, fs, testSelect(t, db, cid, fs,
raw1.Object().Address(), raw1.Object().Address(),
raw2.Object().Address(), raw2.Object().Address(),
raw3.Object().Address(), raw3.Object().Address(),
raw4.Object().Address(),
raw5.Object().Address(),
raw6.Object().Address(),
) )
fs = objectSDK.SearchFilters{} fs = objectSDK.SearchFilters{}
@ -82,6 +114,24 @@ func TestDB_SelectUserAttributes(t *testing.T) {
raw1.Object().Address(), raw1.Object().Address(),
raw2.Object().Address(), raw2.Object().Address(),
raw3.Object().Address(), raw3.Object().Address(),
raw4.Object().Address(),
raw5.Object().Address(),
raw6.Object().Address(),
)
fs = objectSDK.SearchFilters{}
fs.AddFilter("path", "test", objectSDK.MatchCommonPrefix)
testSelect(t, db, cid, fs,
raw4.Object().Address(),
raw5.Object().Address(),
raw6.Object().Address(),
)
fs = objectSDK.SearchFilters{}
fs.AddFilter("path", "test/1", objectSDK.MatchCommonPrefix)
testSelect(t, db, cid, fs,
raw4.Object().Address(),
raw5.Object().Address(),
) )
} }