From ff54df073ebb1fa9e01d2ba4bf3444d99cf428c0 Mon Sep 17 00:00:00 2001 From: Alex Sharov Date: Wed, 6 Sep 2023 14:51:23 +0700 Subject: [PATCH] etl: do sort and file flush in another goroutine (#7915) --- cmd/devnet/devnet/context.go | 2 +- cmd/devnet/devnet/network.go | 2 +- cmd/devnet/main.go | 3 +-- cmd/integration/commands/reset_state.go | 3 ++- go.mod | 2 +- go.sum | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cmd/devnet/devnet/context.go b/cmd/devnet/devnet/context.go index 191b3b714..002567e22 100644 --- a/cmd/devnet/devnet/context.go +++ b/cmd/devnet/devnet/context.go @@ -1,7 +1,7 @@ package devnet import ( - context "context" + "context" "math/big" "github.com/ledgerwatch/log/v3" diff --git a/cmd/devnet/devnet/network.go b/cmd/devnet/devnet/network.go index 91477328a..701b71f76 100644 --- a/cmd/devnet/devnet/network.go +++ b/cmd/devnet/devnet/network.go @@ -1,7 +1,7 @@ package devnet import ( - context "context" + "context" "errors" "fmt" "math/big" diff --git a/cmd/devnet/main.go b/cmd/devnet/main.go index 0868a7e96..0d6d482b8 100644 --- a/cmd/devnet/main.go +++ b/cmd/devnet/main.go @@ -6,9 +6,8 @@ import ( "os" "os/signal" "path/filepath" - "strings" - dbg "runtime/debug" + "strings" "syscall" "time" diff --git a/cmd/integration/commands/reset_state.go b/cmd/integration/commands/reset_state.go index 3ec3d007a..665525f92 100644 --- a/cmd/integration/commands/reset_state.go +++ b/cmd/integration/commands/reset_state.go @@ -5,10 +5,11 @@ import ( "encoding/binary" "errors" "fmt" - "github.com/ledgerwatch/erigon/turbo/backup" "os" "text/tabwriter" + "github.com/ledgerwatch/erigon/turbo/backup" + "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon-lib/kv" "github.com/ledgerwatch/erigon-lib/kv/kvcfg" diff --git a/go.mod b/go.mod index 336cd3542..9f0b8d11b 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( github.com/erigontech/mdbx-go v0.27.14 - github.com/ledgerwatch/erigon-lib v0.0.0-20230906074044-ab828e32589a + github.com/ledgerwatch/erigon-lib v0.0.0-20230906074517-9bd101cf0dce github.com/ledgerwatch/erigon-snapshot v1.2.1-0.20230818153427-cc16b83a89be github.com/ledgerwatch/log/v3 v3.9.0 github.com/ledgerwatch/secp256k1 v1.0.0 diff --git a/go.sum b/go.sum index a03e71cc1..d628cfbcd 100644 --- a/go.sum +++ b/go.sum @@ -497,8 +497,8 @@ github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kylelemons/godebug v0.0.0-20170224010052-a616ab194758 h1:0D5M2HQSGD3PYPwICLl+/9oulQauOuETfgFvhBDffs0= github.com/leanovate/gopter v0.2.9 h1:fQjYxZaynp97ozCzfOyOuAGOU4aU/z37zf/tOujFk7c= github.com/leanovate/gopter v0.2.9/go.mod h1:U2L/78B+KVFIx2VmW6onHJQzXtFb+p5y3y2Sh+Jxxv8= -github.com/ledgerwatch/erigon-lib v0.0.0-20230906074044-ab828e32589a h1:8f6ipOLgir2x8x49gg/LTy+5iYh1YnEGRFdSS4BfSsY= -github.com/ledgerwatch/erigon-lib v0.0.0-20230906074044-ab828e32589a/go.mod h1:GAusrYt0h9+407hBbOjfMzoFIX14xzXTl250QJBhTpE= +github.com/ledgerwatch/erigon-lib v0.0.0-20230906074517-9bd101cf0dce h1:fyvkMYAvSLzYJZziKvElUmk/lqo++G6mv6dY6lkTRnE= +github.com/ledgerwatch/erigon-lib v0.0.0-20230906074517-9bd101cf0dce/go.mod h1:GAusrYt0h9+407hBbOjfMzoFIX14xzXTl250QJBhTpE= github.com/ledgerwatch/erigon-snapshot v1.2.1-0.20230818153427-cc16b83a89be h1:6/4MXkk5AoKUHivIpCokHOX/WV9L7tXgURp1k8KfmSM= github.com/ledgerwatch/erigon-snapshot v1.2.1-0.20230818153427-cc16b83a89be/go.mod h1:3AuPxZc85jkehh/HA9h8gabv5MSi3kb/ddtzBsTVJFo= github.com/ledgerwatch/log/v3 v3.9.0 h1:iDwrXe0PVwBC68Dd94YSsHbMgQ3ufsgjzXtFNFVZFRk=