d.zverev/frostfs-contract
1
0
Fork 0
forked from TrueCloudLab/frostfs-contract
Code Pull requests Activity

[#47] Update iterator interface

Browse source 
Signed-off-by: Alex Vanin <alexey@nspcc.ru>
This commit is contained in:
Alex Vanin 2021-02-08 18:23:08 +03:00 committed by Alex Vanin
parent 75c696a555
commit fd803ef639
5 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
audit/audit_contract.go
View file

@ -95,13 +95,13 @@ func Get(id []byte) []byte {
} }
func List() [][]byte { func List() [][]byte {
it := storage.Find(ctx, []byte{}) it := storage.Find(ctx, []byte{}, storage.KeysOnly)
return list(it) return list(it)
} }
func ListByEpoch(epoch int) [][]byte { func ListByEpoch(epoch int) [][]byte {
it := storage.Find(ctx, epoch) it := storage.Find(ctx, epoch, storage.KeysOnly)
return list(it) return list(it)
} }
@ -110,7 +110,7 @@ func ListByCID(epoch int, cid []byte) [][]byte {
var buf interface{} = epoch var buf interface{} = epoch
prefix := append(buf.([]byte), cid...) prefix := append(buf.([]byte), cid...)
it := storage.Find(ctx, prefix) it := storage.Find(ctx, prefix, storage.KeysOnly)
return list(it) return list(it)
} }
@ -122,7 +122,7 @@ func ListByNode(epoch int, cid []byte, key interop.PublicKey) [][]byte {
from: key, from: key,
} }
it := storage.Find(ctx, hdr.ID()) it := storage.Find(ctx, hdr.ID(), storage.KeysOnly)
return list(it) return list(it)
} }
@ -131,7 +131,7 @@ func list(it iterator.Iterator) [][]byte {
var result [][]byte var result [][]byte
for iterator.Next(it) { for iterator.Next(it) {
key := iterator.Key(it).([]byte) key := iterator.Value(it).([]byte) // iterator MUST BE `storage.KeysOnly`
if len(key) == netmapContractKeyLn { if len(key) == netmapContractKeyLn {
continue continue
} }

4
balance/balance_contract.go
View file

@ -193,9 +193,9 @@ func NewEpoch(epochNum int) bool {
n := common.Vote(ctx, epochID, irKey) n := common.Vote(ctx, epochID, irKey)
if n >= threshold { if n >= threshold {
common.RemoveVotes(ctx, epochID) common.RemoveVotes(ctx, epochID)
it := storage.Find(ctx, []byte{}) it := storage.Find(ctx, []byte{}, storage.KeysOnly)
for iterator.Next(it) { for iterator.Next(it) {
addr := iterator.Key(it).([]byte) addr := iterator.Value(it).([]byte) // it MUST BE `storage.KeysOnly`
if len(addr) != 20 { if len(addr) != 20 {
continue continue
} }

12
container/container_contract.go
View file

@ -322,12 +322,12 @@ func ListContainerSizes(epoch int) [][]byte {
key := []byte(estimateKeyPrefix) key := []byte(estimateKeyPrefix)
key = append(key, buf.([]byte)...) key = append(key, buf.([]byte)...)
it := storage.Find(ctx, key) it := storage.Find(ctx, key, storage.KeysOnly)
var result [][]byte var result [][]byte
for iterator.Next(it) { for iterator.Next(it) {
key := iterator.Key(it).([]byte) key := iterator.Value(it).([]byte) // it MUST BE `storage.KeysOnly`
result = append(result, key) result = append(result, key)
} }
@ -467,9 +467,9 @@ func remove(ctx storage.Context, key interface{}, value []byte) int {
func getAllContainers(ctx storage.Context) [][]byte { func getAllContainers(ctx storage.Context) [][]byte {
var list [][]byte var list [][]byte
it := storage.Find(ctx, []byte{}) it := storage.Find(ctx, []byte{}, storage.KeysOnly)
for iterator.Next(it) { for iterator.Next(it) {
key := iterator.Key(it).([]byte) key := iterator.Value(it).([]byte) // it MUST BE `storage.KeysOnly`
if len(key) == containerIDSize { if len(key) == containerIDSize {
list = append(list, key) list = append(list, key)
} }
@ -577,9 +577,9 @@ func isStorageNode(key interop.PublicKey) bool {
func keysToDelete(epoch int) [][]byte { func keysToDelete(epoch int) [][]byte {
results := [][]byte{} results := [][]byte{}
it := storage.Find(ctx, []byte(estimateKeyPrefix)) it := storage.Find(ctx, []byte(estimateKeyPrefix), storage.KeysOnly)
for iterator.Next(it) { for iterator.Next(it) {
k := iterator.Key(it).([]byte) k := iterator.Value(it).([]byte) // it MUST BE `storage.KeysOnly`
nbytes := k[len(estimateKeyPrefix) : len(k)-32] nbytes := k[len(estimateKeyPrefix) : len(k)-32]
var n interface{} = nbytes var n interface{} = nbytes

7
neofs/neofs_contract.go
View file

@ -477,10 +477,11 @@ func SetConfig(id, key, val []byte) bool {
func ListConfig() []record { func ListConfig() []record {
var config []record var config []record
it := storage.Find(ctx, configPrefix) it := storage.Find(ctx, configPrefix, storage.None)
for iterator.Next(it) { for iterator.Next(it) {
key := iterator.Key(it).([]byte) pair := iterator.Value(it).([]interface{})
val := iterator.Value(it).([]byte) key := pair[0].([]byte)
val := pair[1].([]byte)
r := record{key: key[len(configPrefix):], val: val} r := record{key: key[len(configPrefix):], val: val}
config = append(config, r) config = append(config, r)

7
netmap/netmap_contract.go
View file

@ -320,10 +320,11 @@ func InitConfig(args [][]byte) bool {
func ListConfig() []record { func ListConfig() []record {
var config []record var config []record
it := storage.Find(ctx, configPrefix) it := storage.Find(ctx, configPrefix, storage.None)
for iterator.Next(it) { for iterator.Next(it) {
key := iterator.Key(it).([]byte) pair := iterator.Value(it).([]interface{})
val := iterator.Value(it).([]byte) key := pair[0].([]byte)
val := pair[1].([]byte)
r := record{key: key[len(configPrefix):], val: val} r := record{key: key[len(configPrefix):], val: val}
config = append(config, r) config = append(config, r)