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

[#423] *: Use hrw.StringHash() where possible

Browse source 
Signed-off-by: Evgenii Stratonikov <e.stratonikov@yadro.com>
This commit is contained in:
Evgenii Stratonikov 2023-06-02 15:39:16 +03:00 committed by Evgenii Stratonikov
parent cd92d8a9e7
commit 41ab4d070e
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/local_object_storage/blobstor/blobovniczatree/blobovnicza.go
View file

@ -216,7 +216,7 @@ func addressHash(addr *oid.Address, path string) uint64 {
a = addr.EncodeToString() a = addr.EncodeToString()
} }
return hrw.Hash([]byte(a + path)) return hrw.StringHash(a + path)
} }
// converts uint64 to hex string. // converts uint64 to hex string.

2
pkg/local_object_storage/engine/engine_test.go
View file

@ -101,7 +101,7 @@ func (te *testEngineWrapper) setInitializedShards(t testing.TB, shards ...*shard
errorCount: new(atomic.Uint32), errorCount: new(atomic.Uint32),
Shard: s, Shard: s,
}, },
hash: hrw.Hash([]byte(s.ID().String())), hash: hrw.StringHash(s.ID().String()),
} }
te.engine.shardPools[s.ID().String()] = pool te.engine.shardPools[s.ID().String()] = pool
te.shardIDs = append(te.shardIDs, s.ID()) te.shardIDs = append(te.shardIDs, s.ID())

2
pkg/local_object_storage/engine/evacuate.go
View file

@ -373,7 +373,7 @@ func (e *StorageEngine) evacuateObjects(ctx context.Context, sh *shard.Shard, to
func (e *StorageEngine) tryEvacuateObjectLocal(ctx context.Context, addr oid.Address, object *objectSDK.Object, sh *shard.Shard, func (e *StorageEngine) tryEvacuateObjectLocal(ctx context.Context, addr oid.Address, object *objectSDK.Object, sh *shard.Shard,
shards []pooledShard, weights []float64, shardsToEvacuate map[string]*shard.Shard, res *EvacuateShardRes) (bool, error) { shards []pooledShard, weights []float64, shardsToEvacuate map[string]*shard.Shard, res *EvacuateShardRes) (bool, error) {
hrw.SortHasherSliceByWeightValue(shards, weights, hrw.Hash([]byte(addr.EncodeToString()))) hrw.SortHasherSliceByWeightValue(shards, weights, hrw.StringHash(addr.EncodeToString()))
for j := range shards { for j := range shards {
select { select {
case <-ctx.Done(): case <-ctx.Done():

2
pkg/local_object_storage/engine/remove_copies.go
View file

@ -110,7 +110,7 @@ func (e *StorageEngine) removeObjects(ctx context.Context, ch <-chan oid.Address
} }
for addr := range ch { for addr := range ch {
h := hrw.Hash([]byte(addr.EncodeToString())) h := hrw.StringHash(addr.EncodeToString())
shards := sortShardsByWeight(shards, h) shards := sortShardsByWeight(shards, h)
found := false found := false
for i := range shards { for i := range shards {

4
pkg/local_object_storage/engine/shards.go
View file

@ -162,7 +162,7 @@ func (e *StorageEngine) addShard(sh *shard.Shard) error {
errorCount: new(atomic.Uint32), errorCount: new(atomic.Uint32),
Shard: sh, Shard: sh,
}, },
hash: hrw.Hash([]byte(strID)), hash: hrw.StringHash(strID),
} }
e.shardPools[strID] = pool e.shardPools[strID] = pool
@ -237,7 +237,7 @@ func (e *StorageEngine) sortShardsByWeight(objAddr interface{ EncodeToString() s
e.mtx.RLock() e.mtx.RLock()
defer e.mtx.RUnlock() defer e.mtx.RUnlock()
h := hrw.Hash([]byte(objAddr.EncodeToString())) h := hrw.StringHash(objAddr.EncodeToString())
shards := make([]hashedShard, 0, len(e.shards)) shards := make([]hashedShard, 0, len(e.shards))
for _, sh := range e.shards { for _, sh := range e.shards {
shards = append(shards, hashedShard(sh)) shards = append(shards, hashedShard(sh))