This repository has been archived by the owner on Oct 4, 2019. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 165
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'upstream/master' into fix/schroedinger-tests
- Loading branch information
Showing
82 changed files
with
54,152 additions
and
112,359 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,146 @@ | ||
| package main | ||
|
|
||
| import ( | ||
| "github.com/ethereumproject/go-ethereum/core" | ||
| "github.com/ethereumproject/go-ethereum/core/types" | ||
| "github.com/ethereumproject/go-ethereum/ethdb" | ||
| "github.com/ethereumproject/go-ethereum/logger" | ||
| "github.com/ethereumproject/go-ethereum/logger/glog" | ||
| "gopkg.in/urfave/cli.v1" | ||
| "os" | ||
| "time" | ||
| ) | ||
|
|
||
| var buildAddrTxIndexCommand = cli.Command{ | ||
| Action: buildAddrTxIndexCmd, | ||
| Name: "atxi-build", | ||
| Usage: "Generate index for transactions by address", | ||
| Description: ` | ||
| Builds an index for transactions by address. | ||
| The command is idempotent; it will not hurt to run multiple times on the same range. | ||
| If run without --start flag, the command makes use of a persistent placeholder, so you can | ||
| run the command on multiple occasions and pick up indexing progress where the last session | ||
| left off. | ||
| To enable address-transaction indexing during block sync and import, use the '--atxi' flag. | ||
| `, | ||
| Flags: []cli.Flag{ | ||
| cli.IntFlag{ | ||
| Name: "start", | ||
| Usage: "Block number at which to begin building index", | ||
| }, | ||
| cli.IntFlag{ | ||
| Name: "stop", | ||
| Usage: "Block number at which to stop building index", | ||
| }, | ||
| cli.IntFlag{ | ||
| Name: "step", | ||
| Usage: "Step increment for batching. Higher number requires more mem, but may be faster", | ||
| Value: 10000, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| func buildAddrTxIndexCmd(ctx *cli.Context) error { | ||
|
|
||
| // Divide global cache availability equally between chaindata (pre-existing blockdata) and | ||
| // address-transaction database. This ratio is arbitrary and could potentially be optimized or delegated to be user configurable. | ||
| ethdb.SetCacheRatio("chaindata", 0.5) | ||
| ethdb.SetHandleRatio("chaindata", 1) | ||
| ethdb.SetCacheRatio("indexes", 0.5) | ||
| ethdb.SetHandleRatio("indexes", 1) | ||
|
|
||
| startIndex := uint64(ctx.Int("start")) | ||
| var stopIndex uint64 | ||
|
|
||
| indexDb := MakeIndexDatabase(ctx) | ||
| if indexDb == nil { | ||
| glog.Fatalln("indexes db is nil") | ||
| } | ||
| defer indexDb.Close() | ||
|
|
||
| // Use persistent placeholder in case start not spec'd | ||
| if !ctx.IsSet("start") { | ||
| startIndex = core.GetATXIBookmark(indexDb) | ||
| } | ||
|
|
||
| bc, chainDB := MakeChain(ctx) | ||
| if bc == nil || chainDB == nil { | ||
| glog.Fatalln("bc or cdb is nil") | ||
| } | ||
| defer chainDB.Close() | ||
|
|
||
| stopIndex = uint64(ctx.Int("stop")) | ||
| if stopIndex == 0 { | ||
| stopIndex = bc.CurrentBlock().NumberU64() | ||
| if n := bc.CurrentFastBlock().NumberU64(); n > stopIndex { | ||
| stopIndex = n | ||
| } | ||
| } | ||
|
|
||
| if stopIndex < startIndex { | ||
| glog.Fatalln("start must be prior to (smaller than) or equal to stop, got start=", startIndex, "stop=", stopIndex) | ||
| } | ||
| if startIndex == stopIndex { | ||
| glog.D(logger.Error).Infoln("atxi is up to date, exiting") | ||
| os.Exit(0) | ||
| } | ||
|
|
||
| var block *types.Block | ||
| blockIndex := startIndex | ||
| block = bc.GetBlockByNumber(blockIndex) | ||
| if block == nil { | ||
| glog.Fatalln(blockIndex, "block is nil") | ||
| } | ||
|
|
||
| var inc = uint64(ctx.Int("step")) | ||
| startTime := time.Now() | ||
| totalTxCount := uint64(0) | ||
| glog.D(logger.Error).Infoln("Address/tx indexing (atxi) start:", startIndex, "stop:", stopIndex, "step:", inc, "| This may take a while.") | ||
| breaker := false | ||
| for i := startIndex; i <= stopIndex; i = i + inc { | ||
| if i+inc > stopIndex { | ||
| inc = stopIndex - i | ||
| breaker = true | ||
| } | ||
|
|
||
| stepStartTime := time.Now() | ||
|
|
||
| // It may seem weird to pass i, i+inc, and inc, but its just a "coincidence" | ||
| // The function could accepts a smaller step for batch putting (in this case, inc), | ||
| // or a larger stopBlock (i+inc), but this is just how this cmd is using the fn now | ||
| // We could mess around a little with exploring batch optimization... | ||
| txsCount, err := bc.WriteBlockAddrTxIndexesBatch(indexDb, i, i+inc, inc) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| totalTxCount += uint64(txsCount) | ||
|
|
||
| if err := core.SetATXIBookmark(indexDb, i+inc); err != nil { | ||
| glog.Fatalln(err) | ||
| } | ||
|
|
||
| glog.D(logger.Error).Infof("atxi-build: block %d / %d txs: %d took: %v %.2f bps %.2f txps", i+inc, stopIndex, txsCount, time.Since(stepStartTime).Round(time.Millisecond), float64(inc)/time.Since(stepStartTime).Seconds(), float64(txsCount)/time.Since(stepStartTime).Seconds()) | ||
| glog.V(logger.Info).Infof("atxi-build: block %d / %d txs: %d took: %v %.2f bps %.2f txps", i+inc, stopIndex, txsCount, time.Since(stepStartTime).Round(time.Millisecond), float64(inc)/time.Since(stepStartTime).Seconds(), float64(txsCount)/time.Since(stepStartTime).Seconds()) | ||
|
|
||
| if breaker { | ||
| break | ||
| } | ||
| } | ||
|
|
||
| if err := core.SetATXIBookmark(indexDb, stopIndex); err != nil { | ||
| glog.Fatalln(err) | ||
| } | ||
|
|
||
| // Print summary | ||
| totalBlocksF := float64(stopIndex - startIndex) | ||
| totalTxsF := float64(totalTxCount) | ||
| took := time.Since(startTime) | ||
| glog.D(logger.Error).Infof(`Finished atxi-build in %v: %d blocks (~ %.2f blocks/sec), %d txs (~ %.2f txs/sec)`, | ||
| took.Round(time.Second), | ||
| stopIndex-startIndex, | ||
| totalBlocksF/took.Seconds(), | ||
| totalTxCount, | ||
| totalTxsF/took.Seconds(), | ||
| ) | ||
| return nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.