Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Optimization: encode hash to hex only on log TRACE level set #6338

Merged
merged 6 commits into from
Nov 14, 2024
Merged

Optimization: encode hash to hex only on log TRACE level set #6338

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6841919
calculate hash only on log trace level set.
cristure Jul 26, 2024
85d93ac
add non-memory thrasher test.
cristure Jul 29, 2024
79eb08c
Merge branch 'rc/v1.7.next1' into benchmark_trie
AdoAdoAdo Sep 3, 2024
1ec7c5c
Merge branch 'rc/v1.7.next1' into benchmark_trie
andreibancioiu Sep 6, 2024
af01f4a
Convert artificial test into a benchmark.
andreibancioiu Sep 6, 2024
bc70dcc
Merge branch 'rc/v1.7.next1' into benchmark_trie
andreibancioiu Nov 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 16 additions & 11 deletions trie/patriciaMerkleTrie.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,14 @@ import (
"github.com/multiversx/mx-chain-core-go/core/check"
"github.com/multiversx/mx-chain-core-go/hashing"
"github.com/multiversx/mx-chain-core-go/marshal"
logger "github.com/multiversx/mx-chain-logger-go"
vmcommon "github.com/multiversx/mx-chain-vm-common-go"

"github.com/multiversx/mx-chain-go/common"
"github.com/multiversx/mx-chain-go/dataRetriever"
"github.com/multiversx/mx-chain-go/errors"
"github.com/multiversx/mx-chain-go/trie/keyBuilder"
"github.com/multiversx/mx-chain-go/trie/statistics"
logger "github.com/multiversx/mx-chain-logger-go"
vmcommon "github.com/multiversx/mx-chain-vm-common-go"
)

var log = logger.GetOrCreate("trie")
Expand Down Expand Up @@ -118,10 +119,12 @@ func (tr *patriciaMerkleTrie) Update(key, value []byte) error {
tr.mutOperation.Lock()
defer tr.mutOperation.Unlock()

log.Trace("update trie",
"key", hex.EncodeToString(key),
"val", hex.EncodeToString(value),
)
if log.GetLevel() == logger.LogTrace {
log.Trace("update trie",
"key", hex.EncodeToString(key),
"val", hex.EncodeToString(value),
)
}

return tr.update(key, value, core.NotSpecified)
}
Expand All @@ -131,11 +134,13 @@ func (tr *patriciaMerkleTrie) UpdateWithVersion(key []byte, value []byte, versio
tr.mutOperation.Lock()
defer tr.mutOperation.Unlock()

log.Trace("update trie with version",
"key", hex.EncodeToString(key),
"val", hex.EncodeToString(value),
"version", version,
)
if log.GetLevel() == logger.LogTrace {
log.Trace("update trie with version",
"key", hex.EncodeToString(key),
"val", hex.EncodeToString(value),
"version", version,
)
}

return tr.update(key, value, version)
}
Expand Down
Loading