[#1377] oid, cid: Upgrade SDK package
Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
This commit is contained in:
Leonard Lyubich
LeL
parent
f65898a354
commit
f15e6e888f
118 changed files with 1455 additions and 886 deletions
|
|
@ -10,6 +10,7 @@ import (
|
|||
cidtest "github.com/nspcc-dev/neofs-sdk-go/container/id/test"
|
||||
objectSDK "github.com/nspcc-dev/neofs-sdk-go/object"
|
||||
addressSDK "github.com/nspcc-dev/neofs-sdk-go/object/address"
|
||||
oidtest "github.com/nspcc-dev/neofs-sdk-go/object/id/test"
|
||||
"github.com/nspcc-dev/neofs-sdk-go/version"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
|
@ -17,41 +18,41 @@ import (
|
|||
func TestDB_SelectUserAttributes(t *testing.T) {
|
||||
db := newDB(t)
|
||||
|
||||
cid := cidtest.ID()
|
||||
cnr := cidtest.ID()
|
||||
|
||||
raw1 := generateObjectWithCID(t, cid)
|
||||
raw1 := generateObjectWithCID(t, cnr)
|
||||
addAttribute(raw1, "foo", "bar")
|
||||
addAttribute(raw1, "x", "y")
|
||||
|
||||
err := putBig(db, raw1)
|
||||
require.NoError(t, err)
|
||||
|
||||
raw2 := generateObjectWithCID(t, cid)
|
||||
raw2 := generateObjectWithCID(t, cnr)
|
||||
addAttribute(raw2, "foo", "bar")
|
||||
addAttribute(raw2, "x", "z")
|
||||
|
||||
err = putBig(db, raw2)
|
||||
require.NoError(t, err)
|
||||
|
||||
raw3 := generateObjectWithCID(t, cid)
|
||||
raw3 := generateObjectWithCID(t, cnr)
|
||||
addAttribute(raw3, "a", "b")
|
||||
|
||||
err = putBig(db, raw3)
|
||||
require.NoError(t, err)
|
||||
|
||||
raw4 := generateObjectWithCID(t, cid)
|
||||
raw4 := generateObjectWithCID(t, cnr)
|
||||
addAttribute(raw4, "path", "test/1/2")
|
||||
|
||||
err = putBig(db, raw4)
|
||||
require.NoError(t, err)
|
||||
|
||||
raw5 := generateObjectWithCID(t, cid)
|
||||
raw5 := generateObjectWithCID(t, cnr)
|
||||
addAttribute(raw5, "path", "test/1/3")
|
||||
|
||||
err = putBig(db, raw5)
|
||||
require.NoError(t, err)
|
||||
|
||||
raw6 := generateObjectWithCID(t, cid)
|
||||
raw6 := generateObjectWithCID(t, cnr)
|
||||
addAttribute(raw6, "path", "test/2/3")
|
||||
|
||||
err = putBig(db, raw6)
|
||||
|
|
@ -59,30 +60,30 @@ func TestDB_SelectUserAttributes(t *testing.T) {
|
|||
|
||||
fs := objectSDK.SearchFilters{}
|
||||
fs.AddFilter("foo", "bar", objectSDK.MatchStringEqual)
|
||||
testSelect(t, db, cid, fs,
|
||||
testSelect(t, db, cnr, fs,
|
||||
object.AddressOf(raw1),
|
||||
object.AddressOf(raw2),
|
||||
)
|
||||
|
||||
fs = objectSDK.SearchFilters{}
|
||||
fs.AddFilter("x", "y", objectSDK.MatchStringEqual)
|
||||
testSelect(t, db, cid, fs, object.AddressOf(raw1))
|
||||
testSelect(t, db, cnr, fs, object.AddressOf(raw1))
|
||||
|
||||
fs = objectSDK.SearchFilters{}
|
||||
fs.AddFilter("x", "y", objectSDK.MatchStringNotEqual)
|
||||
testSelect(t, db, cid, fs, object.AddressOf(raw2))
|
||||
testSelect(t, db, cnr, fs, object.AddressOf(raw2))
|
||||
|
||||
fs = objectSDK.SearchFilters{}
|
||||
fs.AddFilter("a", "b", objectSDK.MatchStringEqual)
|
||||
testSelect(t, db, cid, fs, object.AddressOf(raw3))
|
||||
testSelect(t, db, cnr, fs, object.AddressOf(raw3))
|
||||
|
||||
fs = objectSDK.SearchFilters{}
|
||||
fs.AddFilter("c", "d", objectSDK.MatchStringEqual)
|
||||
testSelect(t, db, cid, fs)
|
||||
testSelect(t, db, cnr, fs)
|
||||
|
||||
fs = objectSDK.SearchFilters{}
|
||||
fs.AddFilter("foo", "", objectSDK.MatchNotPresent)
|
||||
testSelect(t, db, cid, fs,
|
||||
testSelect(t, db, cnr, fs,
|
||||
object.AddressOf(raw3),
|
||||
object.AddressOf(raw4),
|
||||
object.AddressOf(raw5),
|
||||
|
|
@ -91,7 +92,7 @@ func TestDB_SelectUserAttributes(t *testing.T) {
|
|||
|
||||
fs = objectSDK.SearchFilters{}
|
||||
fs.AddFilter("a", "", objectSDK.MatchNotPresent)
|
||||
testSelect(t, db, cid, fs,
|
||||
testSelect(t, db, cnr, fs,
|
||||
object.AddressOf(raw1),
|
||||
object.AddressOf(raw2),
|
||||
object.AddressOf(raw4),
|
||||
|
|
@ -100,7 +101,7 @@ func TestDB_SelectUserAttributes(t *testing.T) {
|
|||
)
|
||||
|
||||
fs = objectSDK.SearchFilters{}
|
||||
testSelect(t, db, cid, fs,
|
||||
testSelect(t, db, cnr, fs,
|
||||
object.AddressOf(raw1),
|
||||
object.AddressOf(raw2),
|
||||
object.AddressOf(raw3),
|
||||
|
|
@ -111,7 +112,7 @@ func TestDB_SelectUserAttributes(t *testing.T) {
|
|||
|
||||
fs = objectSDK.SearchFilters{}
|
||||
fs.AddFilter("key", "", objectSDK.MatchNotPresent)
|
||||
testSelect(t, db, cid, fs,
|
||||
testSelect(t, db, cnr, fs,
|
||||
object.AddressOf(raw1),
|
||||
object.AddressOf(raw2),
|
||||
object.AddressOf(raw3),
|
||||
|
|
@ -122,7 +123,7 @@ func TestDB_SelectUserAttributes(t *testing.T) {
|
|||
|
||||
fs = objectSDK.SearchFilters{}
|
||||
fs.AddFilter("path", "test", objectSDK.MatchCommonPrefix)
|
||||
testSelect(t, db, cid, fs,
|
||||
testSelect(t, db, cnr, fs,
|
||||
object.AddressOf(raw4),
|
||||
object.AddressOf(raw5),
|
||||
object.AddressOf(raw6),
|
||||
|
|
@ -130,13 +131,14 @@ func TestDB_SelectUserAttributes(t *testing.T) {
|
|||
|
||||
fs = objectSDK.SearchFilters{}
|
||||
fs.AddFilter("path", "test/1", objectSDK.MatchCommonPrefix)
|
||||
testSelect(t, db, cid, fs,
|
||||
testSelect(t, db, cnr, fs,
|
||||
object.AddressOf(raw4),
|
||||
object.AddressOf(raw5),
|
||||
)
|
||||
}
|
||||
|
||||
func TestDB_SelectRootPhyParent(t *testing.T) {
|
||||
t.Skip("not working, see neofs-sdk-go#242")
|
||||
db := newDB(t)
|
||||
|
||||
cid := cidtest.ID()
|
||||
|
|
@ -171,14 +173,17 @@ func TestDB_SelectRootPhyParent(t *testing.T) {
|
|||
|
||||
rightChild := generateObjectWithCID(t, cid)
|
||||
rightChild.SetParent(parent)
|
||||
rightChild.SetParentID(parent.ID())
|
||||
idParent, _ := parent.ID()
|
||||
rightChild.SetParentID(idParent)
|
||||
err = putBig(db, rightChild)
|
||||
require.NoError(t, err)
|
||||
|
||||
link := generateObjectWithCID(t, cid)
|
||||
link.SetParent(parent)
|
||||
link.SetParentID(parent.ID())
|
||||
link.SetChildren(*leftChild.ID(), *rightChild.ID())
|
||||
link.SetParentID(idParent)
|
||||
idLeftChild, _ := leftChild.ID()
|
||||
idRightChild, _ := rightChild.ID()
|
||||
link.SetChildren(idLeftChild, idRightChild)
|
||||
|
||||
err = putBig(db, link)
|
||||
require.NoError(t, err)
|
||||
|
|
@ -283,9 +288,11 @@ func TestDB_SelectRootPhyParent(t *testing.T) {
|
|||
})
|
||||
|
||||
t.Run("objects with parent", func(t *testing.T) {
|
||||
idParent, _ := parent.ID()
|
||||
|
||||
fs := objectSDK.SearchFilters{}
|
||||
fs.AddFilter(v2object.FilterHeaderParent,
|
||||
parent.ID().String(),
|
||||
idParent.EncodeToString(),
|
||||
objectSDK.MatchStringEqual)
|
||||
|
||||
testSelect(t, db, cid, fs,
|
||||
|
|
@ -334,7 +341,7 @@ func TestDB_SelectInhume(t *testing.T) {
|
|||
|
||||
tombstone := addressSDK.NewAddress()
|
||||
tombstone.SetContainerID(cid)
|
||||
tombstone.SetObjectID(testOID())
|
||||
tombstone.SetObjectID(oidtest.ID())
|
||||
|
||||
err = meta.Inhume(db, object.AddressOf(raw2), tombstone)
|
||||
require.NoError(t, err)
|
||||
|
|
@ -483,6 +490,7 @@ func TestDB_SelectWithSlowFilters(t *testing.T) {
|
|||
}
|
||||
|
||||
func TestDB_SelectObjectID(t *testing.T) {
|
||||
t.Skip("not working, see neofs-sdk-go#242")
|
||||
db := newDB(t)
|
||||
|
||||
cid := cidtest.ID()
|
||||
|
|
@ -492,7 +500,8 @@ func TestDB_SelectObjectID(t *testing.T) {
|
|||
parent := generateObjectWithCID(t, cid)
|
||||
|
||||
regular := generateObjectWithCID(t, cid)
|
||||
regular.SetParentID(parent.ID())
|
||||
idParent, _ := parent.ID()
|
||||
regular.SetParentID(idParent)
|
||||
regular.SetParent(parent)
|
||||
|
||||
err := putBig(db, regular)
|
||||
|
|
@ -513,22 +522,18 @@ func TestDB_SelectObjectID(t *testing.T) {
|
|||
err = putBig(db, lock)
|
||||
require.NoError(t, err)
|
||||
|
||||
t.Run("not present", func(t *testing.T) {
|
||||
fs := objectSDK.SearchFilters{}
|
||||
fs.AddObjectIDFilter(objectSDK.MatchNotPresent, nil)
|
||||
testSelect(t, db, cid, fs)
|
||||
})
|
||||
|
||||
t.Run("not found objects", func(t *testing.T) {
|
||||
raw := generateObjectWithCID(t, cid)
|
||||
|
||||
id, _ := raw.ID()
|
||||
|
||||
fs := objectSDK.SearchFilters{}
|
||||
fs.AddObjectIDFilter(objectSDK.MatchStringEqual, raw.ID())
|
||||
fs.AddObjectIDFilter(objectSDK.MatchStringEqual, id)
|
||||
|
||||
testSelect(t, db, cid, fs)
|
||||
|
||||
fs = objectSDK.SearchFilters{}
|
||||
fs.AddObjectIDFilter(objectSDK.MatchStringNotEqual, raw.ID())
|
||||
fs.AddObjectIDFilter(objectSDK.MatchStringNotEqual, id)
|
||||
|
||||
testSelect(t, db, cid, fs,
|
||||
object.AddressOf(regular),
|
||||
|
|
@ -540,12 +545,14 @@ func TestDB_SelectObjectID(t *testing.T) {
|
|||
})
|
||||
|
||||
t.Run("regular objects", func(t *testing.T) {
|
||||
id, _ := regular.ID()
|
||||
|
||||
fs := objectSDK.SearchFilters{}
|
||||
fs.AddObjectIDFilter(objectSDK.MatchStringEqual, regular.ID())
|
||||
fs.AddObjectIDFilter(objectSDK.MatchStringEqual, id)
|
||||
testSelect(t, db, cid, fs, object.AddressOf(regular))
|
||||
|
||||
fs = objectSDK.SearchFilters{}
|
||||
fs.AddObjectIDFilter(objectSDK.MatchStringNotEqual, regular.ID())
|
||||
fs.AddObjectIDFilter(objectSDK.MatchStringNotEqual, id)
|
||||
testSelect(t, db, cid, fs,
|
||||
object.AddressOf(parent),
|
||||
object.AddressOf(sg),
|
||||
|
|
@ -555,12 +562,14 @@ func TestDB_SelectObjectID(t *testing.T) {
|
|||
})
|
||||
|
||||
t.Run("tombstone objects", func(t *testing.T) {
|
||||
id, _ := ts.ID()
|
||||
|
||||
fs := objectSDK.SearchFilters{}
|
||||
fs.AddObjectIDFilter(objectSDK.MatchStringEqual, ts.ID())
|
||||
fs.AddObjectIDFilter(objectSDK.MatchStringEqual, id)
|
||||
testSelect(t, db, cid, fs, object.AddressOf(ts))
|
||||
|
||||
fs = objectSDK.SearchFilters{}
|
||||
fs.AddObjectIDFilter(objectSDK.MatchStringNotEqual, ts.ID())
|
||||
fs.AddObjectIDFilter(objectSDK.MatchStringNotEqual, id)
|
||||
testSelect(t, db, cid, fs,
|
||||
object.AddressOf(regular),
|
||||
object.AddressOf(parent),
|
||||
|
|
@ -570,12 +579,14 @@ func TestDB_SelectObjectID(t *testing.T) {
|
|||
})
|
||||
|
||||
t.Run("storage group objects", func(t *testing.T) {
|
||||
id, _ := sg.ID()
|
||||
|
||||
fs := objectSDK.SearchFilters{}
|
||||
fs.AddObjectIDFilter(objectSDK.MatchStringEqual, sg.ID())
|
||||
fs.AddObjectIDFilter(objectSDK.MatchStringEqual, id)
|
||||
testSelect(t, db, cid, fs, object.AddressOf(sg))
|
||||
|
||||
fs = objectSDK.SearchFilters{}
|
||||
fs.AddObjectIDFilter(objectSDK.MatchStringNotEqual, sg.ID())
|
||||
fs.AddObjectIDFilter(objectSDK.MatchStringNotEqual, id)
|
||||
testSelect(t, db, cid, fs,
|
||||
object.AddressOf(regular),
|
||||
object.AddressOf(parent),
|
||||
|
|
@ -585,12 +596,14 @@ func TestDB_SelectObjectID(t *testing.T) {
|
|||
})
|
||||
|
||||
t.Run("parent objects", func(t *testing.T) {
|
||||
id, _ := parent.ID()
|
||||
|
||||
fs := objectSDK.SearchFilters{}
|
||||
fs.AddObjectIDFilter(objectSDK.MatchStringEqual, parent.ID())
|
||||
fs.AddObjectIDFilter(objectSDK.MatchStringEqual, id)
|
||||
testSelect(t, db, cid, fs, object.AddressOf(parent))
|
||||
|
||||
fs = objectSDK.SearchFilters{}
|
||||
fs.AddObjectIDFilter(objectSDK.MatchStringNotEqual, parent.ID())
|
||||
fs.AddObjectIDFilter(objectSDK.MatchStringNotEqual, id)
|
||||
testSelect(t, db, cid, fs,
|
||||
object.AddressOf(regular),
|
||||
object.AddressOf(sg),
|
||||
|
|
@ -600,12 +613,14 @@ func TestDB_SelectObjectID(t *testing.T) {
|
|||
})
|
||||
|
||||
t.Run("lock objects", func(t *testing.T) {
|
||||
id, _ := lock.ID()
|
||||
|
||||
fs := objectSDK.SearchFilters{}
|
||||
fs.AddObjectIDFilter(objectSDK.MatchStringEqual, lock.ID())
|
||||
fs.AddObjectIDFilter(objectSDK.MatchStringEqual, id)
|
||||
testSelect(t, db, cid, fs, object.AddressOf(lock))
|
||||
|
||||
fs = objectSDK.SearchFilters{}
|
||||
fs.AddObjectIDFilter(objectSDK.MatchStringNotEqual, lock.ID())
|
||||
fs.AddObjectIDFilter(objectSDK.MatchStringNotEqual, id)
|
||||
testSelect(t, db, cid, fs,
|
||||
object.AddressOf(regular),
|
||||
object.AddressOf(parent),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue