CHANGELOG.md

@@ -42,6 +42,7 @@ Changelog for FrostFS Node
 - `go.opentelemetry.io/otel` to `v1.15.1`
 - `go.opentelemetry.io/otel/trace` to `v1.15.1`
 - `github.com/spf13/cast` to `v1.5.1`
+- `git.frostfs.info/TrueCloudLab/hrw` to `v1.2.1`
 
 ### Updating from v0.36.0
 

go.mod

@@ -6,8 +6,8 @@ require (
 	git.frostfs.info/TrueCloudLab/frostfs-api-go/v2 v2.15.1-0.20230531114046-62edd68f47ac
 	git.frostfs.info/TrueCloudLab/frostfs-contract v0.0.0-20230307110621-19a8ef2d02fb
 	git.frostfs.info/TrueCloudLab/frostfs-observability v0.0.0-20230531082742-c97d21411eb6
-	git.frostfs.info/TrueCloudLab/frostfs-sdk-go v0.0.0-20230530135122-10482ffbed3b
-	git.frostfs.info/TrueCloudLab/hrw v1.2.0
+	git.frostfs.info/TrueCloudLab/frostfs-sdk-go v0.0.0-20230602115440-ec59ebfd8826
+	git.frostfs.info/TrueCloudLab/hrw v1.2.1
 	git.frostfs.info/TrueCloudLab/tzhash v1.8.0
 	github.com/cheggaaa/pb v1.0.29
 	github.com/chzyer/readline v1.5.1
@@ -44,7 +44,7 @@ require (
 require (
 	git.frostfs.info/TrueCloudLab/frostfs-crypto v0.6.0 // indirect
 	git.frostfs.info/TrueCloudLab/rfc6979 v0.4.0 // indirect
-	github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230512164433-5d1fd1a340c9 // indirect
+	github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
 	github.com/benbjohnson/clock v1.1.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cenkalti/backoff/v4 v4.2.1 // indirect
@@ -98,7 +98,7 @@ require (
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/subosito/gotenv v1.4.2 // indirect
 	github.com/syndtr/goleveldb v1.0.1-0.20210305035536-64b5b1c73954 // indirect
-	github.com/twmb/murmur3 v1.1.7 // indirect
+	github.com/twmb/murmur3 v1.1.8 // indirect
 	github.com/urfave/cli v1.22.13 // indirect
 	go.mongodb.org/mongo-driver v1.11.6 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0 // indirect

pkg/local_object_storage/blobstor/blobovniczatree/blobovnicza.go

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

pkg/local_object_storage/engine/engine_test.go

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

pkg/local_object_storage/engine/evacuate.go

@@ -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,
 	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 {
 		select {
 		case <-ctx.Done():

pkg/local_object_storage/engine/remove_copies.go

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

pkg/local_object_storage/engine/shards.go

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