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.

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

e3: native map instead of btree where can (because e2 experience shows - it's faster) #7010

Merged
merged 72 commits into from
Mar 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
b13604d
save
AskAlexSharov Feb 28, 2023
63b20c4
save
AskAlexSharov Feb 28, 2023
fa79bcd
save
AskAlexSharov Feb 28, 2023
8604d4a
save
AskAlexSharov Feb 28, 2023
fb168cb
save
AskAlexSharov Feb 28, 2023
a6cc8c9
save
AskAlexSharov Feb 28, 2023
4706bb8
save
AskAlexSharov Feb 28, 2023
6e4f35c
save
AskAlexSharov Feb 28, 2023
c793783
Merge branch 'e3_call_tracer_reset' into e3_call_tracer_reset2
AskAlexSharov Feb 28, 2023
062f93e
save
AskAlexSharov Feb 28, 2023
6ba2448
save
AskAlexSharov Feb 28, 2023
316110a
save
AskAlexSharov Feb 28, 2023
b26f113
save
AskAlexSharov Feb 28, 2023
11570cd
save
AskAlexSharov Feb 28, 2023
40a4336
save
AskAlexSharov Feb 28, 2023
f9f00ca
save
AskAlexSharov Feb 28, 2023
ecefb12
save
AskAlexSharov Feb 28, 2023
70965f8
save
AskAlexSharov Feb 28, 2023
89753f7
save
AskAlexSharov Feb 28, 2023
5383706
save
AskAlexSharov Feb 28, 2023
f62e956
save
AskAlexSharov Feb 28, 2023
49a0b66
save
AskAlexSharov Feb 28, 2023
877375a
save
AskAlexSharov Feb 28, 2023
fa6a6f2
save
AskAlexSharov Feb 28, 2023
b20ccdd
save
AskAlexSharov Feb 28, 2023
9638894
save
AskAlexSharov Feb 28, 2023
db8ac57
save
AskAlexSharov Feb 28, 2023
c9c9a3d
save
AskAlexSharov Feb 28, 2023
adb7a82
save
AskAlexSharov Feb 28, 2023
4dbc240
save
AskAlexSharov Feb 28, 2023
2f54fbb
save
AskAlexSharov Feb 28, 2023
19cc32d
save
AskAlexSharov Feb 28, 2023
c664c26
save
AskAlexSharov Feb 28, 2023
c52fd98
save
AskAlexSharov Feb 28, 2023
7349408
save
AskAlexSharov Feb 28, 2023
dcf5d4c
save
AskAlexSharov Feb 28, 2023
48d359f
Merge branch 'devel' into e3_kvlist_string
AskAlexSharov Feb 28, 2023
be73c64
save
AskAlexSharov Mar 1, 2023
36892d4
Merge branch 'devel' into e3_kvlist_string
AskAlexSharov Mar 1, 2023
27792fe
Merge branch 'devel' into e3_kvlist_string
AskAlexSharov Mar 1, 2023
f57c3f6
save
AskAlexSharov Mar 1, 2023
a11be3a
Merge branch 'devel' into e3_kvlist_string
AskAlexSharov Mar 2, 2023
db5950c
save
AskAlexSharov Mar 2, 2023
0b5b66a
save
AskAlexSharov Mar 2, 2023
76a9b32
save
AskAlexSharov Mar 2, 2023
25bd4b8
save
AskAlexSharov Mar 2, 2023
f662b36
save
AskAlexSharov Mar 2, 2023
6fde10c
save
AskAlexSharov Mar 2, 2023
3d814ce
save
AskAlexSharov Mar 2, 2023
4eff532
save
AskAlexSharov Mar 2, 2023
cadb6d3
Merge branch 'devel' into e3_map4
AskAlexSharov Mar 2, 2023
0f9415b
save
AskAlexSharov Mar 2, 2023
b89e3f5
save
AskAlexSharov Mar 2, 2023
a575681
save
AskAlexSharov Mar 2, 2023
d5879a9
save
AskAlexSharov Mar 2, 2023
eb9f41a
save
AskAlexSharov Mar 2, 2023
9769086
save
AskAlexSharov Mar 2, 2023
791f819
save
AskAlexSharov Mar 2, 2023
cae410e
save
AskAlexSharov Mar 2, 2023
ff08168
save
AskAlexSharov Mar 2, 2023
2ad9bb7
Merge branch 'e3_map4_faster_apply4' into e3_map5
AskAlexSharov Mar 2, 2023
d95dddb
save
AskAlexSharov Mar 3, 2023
e1d5fb7
Merge branch 'devel' into e3_map6
AskAlexSharov Mar 3, 2023
9374b1d
save
AskAlexSharov Mar 3, 2023
d0fdad5
Merge branch 'devel' into e3_map4_faster_apply2
AskAlexSharov Mar 3, 2023
a22cf07
Merge branch 'e3_map4_faster_apply2' into e3_map6
AskAlexSharov Mar 3, 2023
1268a8a
save
AskAlexSharov Mar 3, 2023
80295a3
save
AskAlexSharov Mar 3, 2023
6443f4d
save
AskAlexSharov Mar 3, 2023
be3c12a
save
AskAlexSharov Mar 3, 2023
1d995c8
Merge branch 'devel' into e3_map6
AskAlexSharov Mar 6, 2023
2b79aa4
Merge branch 'devel' into e3_map6
AskAlexSharov Mar 6, 2023
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
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ lintci:
## lintci-deps: (re)installs golangci-lint to build/bin/golangci-lint
lintci-deps:
rm -f ./build/bin/golangci-lint
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b ./build/bin v1.51.1
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b ./build/bin v1.51.2

## clean: cleans the go cache, build dir, libmdbx db dir
clean:
Expand Down
2 changes: 2 additions & 0 deletions cmd/state/exec3/state.go
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,8 @@ func (rw *Worker) RunTxTaskNoLock(txTask *exec22.TxTask) {
//fmt.Printf("error=%v\n", err)
txTask.Error = err
} else {
//rw.callTracer.AddCoinbase(txTask.Coinbase, txTask.Uncles)
//txTask.TraceTos = rw.callTracer.Tos()
txTask.TraceTos = map[libcommon.Address]struct{}{}
txTask.TraceTos[txTask.Coinbase] = struct{}{}
for _, uncle := range txTask.Uncles {
Expand Down
6 changes: 6 additions & 0 deletions core/state/intra_block_state.go
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,12 @@ func (sdb *IntraBlockState) Error() error {
// Reset clears out all ephemeral state objects from the state db, but keeps
// the underlying state trie to avoid reloading data for the next operations.
func (sdb *IntraBlockState) Reset() {
//if len(sdb.nilAccounts) == 0 || len(sdb.stateObjects) == 0 || len(sdb.stateObjectsDirty) == 0 || len(sdb.balanceInc) == 0 {
// log.Warn("zero", "len(sdb.nilAccounts)", len(sdb.nilAccounts),
// "len(sdb.stateObjects)", len(sdb.stateObjects),
// "len(sdb.stateObjectsDirty)", len(sdb.stateObjectsDirty),
// "len(sdb.balanceInc)", len(sdb.balanceInc))
//}
sdb.nilAccounts = make(map[libcommon.Address]struct{})
sdb.stateObjects = make(map[libcommon.Address]*stateObject)
sdb.stateObjectsDirty = make(map[libcommon.Address]struct{})
Expand Down
Loading