[db]log mptrie node #3634
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
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 |
|---|---|---|
|
|
@@ -38,6 +38,9 @@ func newLeafNode( | |
| return nil, err | ||
| } | ||
| } | ||
| if err := logNode(_nodeTypeLeaf, _actionTypeNew, l, cli); err != nil { | ||
| return nil, err | ||
| } | ||
| return l, nil | ||
| } | ||
|
|
||
|
|
@@ -51,6 +54,9 @@ func newLeafNodeFromProtoPb(pb *triepb.LeafPb, hashVal []byte) *leafNode { | |
| value: pb.Value, | ||
| } | ||
| l.cacheNode.serializable = l | ||
| if err := logNode(_nodeTypeLeaf, _actionTypeNew, l, nil); err != nil { | ||
|
There was a problem hiding this comment. I thought so too at first. iotex-core/db/trie/mptrie/cachenode.go Lines 25 to 32 in 715ccb7 |
||
| panic(err) | ||
| } | ||
| return l | ||
| } | ||
|
|
||
|
|
@@ -63,13 +69,19 @@ func (l *leafNode) Value() []byte { | |
| } | ||
|
|
||
| func (l *leafNode) Delete(cli client, key keyType, offset uint8) (node, error) { | ||
| if err := logNode(_nodeTypeLeaf, _actionTypeDelete, l, cli); err != nil { | ||
| return nil, err | ||
| } | ||
| if !bytes.Equal(l.key[offset:], key[offset:]) { | ||
| return nil, trie.ErrNotExist | ||
| } | ||
| return nil, l.delete(cli) | ||
| } | ||
|
|
||
| func (l *leafNode) Upsert(cli client, key keyType, offset uint8, value []byte) (node, error) { | ||
| if err := logNode(_nodeTypeLeaf, _actionTypeUpsert, l, cli); err != nil { | ||
| return nil, err | ||
| } | ||
| matched := commonPrefixLength(l.key[offset:], key[offset:]) | ||
| if offset+matched == uint8(len(key)) { | ||
| if err := l.delete(cli); err != nil { | ||
|
|
@@ -106,7 +118,10 @@ func (l *leafNode) Upsert(cli client, key keyType, offset uint8, value []byte) ( | |
| return newExtensionNode(cli, l.key[offset:offset+matched], bnode) | ||
| } | ||
|
|
||
| func (l *leafNode) Search(cli client, key keyType, offset uint8) (node, error) { | ||
| if err := logNode(_nodeTypeLeaf, _actionTypeSearch, l, cli); err != nil { | ||
| return nil, err | ||
| } | ||
| if !bytes.Equal(l.key[offset:], key[offset:]) { | ||
| return nil, trie.ErrNotExist | ||
| } | ||
|
|
||
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,127 @@ | ||
| package mptrie | ||
|
There was a problem hiding this comment. IMO, the name |
||
|
|
||
| import ( | ||
| "bufio" | ||
| "os" | ||
|
|
||
| "github.com/pkg/errors" | ||
| ) | ||
|
|
||
| var ( | ||
| enabledLogMptrie = false | ||
| logFile *os.File | ||
| logWriter *bufio.Writer | ||
| ) | ||
|
|
||
| type nodeType byte | ||
| type actionType byte | ||
|
|
||
| const ( | ||
| _nodeTypeLeaf nodeType = 'l' | ||
|
There was a problem hiding this comment. Could a byte array |
||
| _nodeTypeExtension nodeType = 'e' | ||
| _nodeTypeBranch nodeType = 'b' | ||
|
|
||
| _actionTypeSearch actionType = 's' | ||
| _actionTypeUpsert actionType = 'u' | ||
| _actionTypeDelete actionType = 'd' | ||
| _actionTypeNew actionType = 'n' | ||
| ) | ||
|
|
||
| // nodeEvent is the event of node | ||
| type nodeEvent struct { | ||
| NodeType nodeType | ||
| ActionType actionType | ||
| KeyLen uint8 | ||
| Key []byte | ||
| PathLen uint8 | ||
| Path []byte | ||
| ChildrenLen uint8 | ||
| Children []byte | ||
| HashLen uint8 | ||
| HashVal []byte | ||
| } | ||
|
|
||
| // Bytes returns the bytes of node event | ||
| func (e nodeEvent) Bytes() []byte { | ||
| b := make([]byte, 0, 1+1+1+e.KeyLen+1+e.PathLen+1+e.ChildrenLen+1+e.HashLen) | ||
| b = append(b, byte(e.NodeType)) | ||
| b = append(b, byte(e.ActionType)) | ||
| b = append(b, e.KeyLen) | ||
| b = append(b, e.Key...) | ||
| b = append(b, e.PathLen) | ||
| b = append(b, e.Path...) | ||
| b = append(b, e.ChildrenLen) | ||
| b = append(b, e.Children...) | ||
| b = append(b, e.HashLen) | ||
| b = append(b, e.HashVal...) | ||
| return b | ||
| } | ||
|
|
||
| // OpenLogDB open the log DB file | ||
| func OpenLogDB(dbPath string) error { | ||
| var err error | ||
| logFile, err = os.OpenFile(dbPath, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0666) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| logWriter = bufio.NewWriter(logFile) | ||
| enabledLogMptrie = true | ||
| return nil | ||
| } | ||
|
|
||
| // CloseLogDB close the log DB file | ||
| func CloseLogDB() error { | ||
| if !enabledLogMptrie { | ||
| return nil | ||
| } | ||
| if err := logWriter.Flush(); err != nil { | ||
| return err | ||
| } | ||
| return logFile.Close() | ||
| } | ||
|
|
||
| func logNode(nt nodeType, at actionType, n node, cli client) error { | ||
| if !enabledLogMptrie { | ||
| return nil | ||
| } | ||
| nodeKey, nodePath, nodeChildren, hashvalue, err := parseNode(n, cli) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| event := nodeEvent{ | ||
| NodeType: nt, | ||
| ActionType: at, | ||
| KeyLen: uint8(len(nodeKey)), | ||
| Key: nodeKey, | ||
| PathLen: uint8(len(nodePath)), | ||
| Path: nodePath, | ||
| ChildrenLen: uint8(len(nodeChildren)), | ||
| Children: nodeChildren, | ||
| HashLen: uint8(len(hashvalue)), | ||
| HashVal: hashvalue, | ||
| } | ||
| // write event length | ||
| if err = logWriter.WriteByte(byte(len(event.Bytes()))); err != nil { | ||
| return err | ||
| } | ||
| // write event body | ||
| _, err = logWriter.Write(event.Bytes()) | ||
|
There was a problem hiding this comment. How to read the binary data in the db? Do we have the tool or component to print the data? There was a problem hiding this comment. A byte is used to save the size of the binrary. Binary itself is not readable and needs to be processed by tool. In the lognode_test.go, there is a parseNodeEvent that can parse the binrary. How the tools are provided needs to be discussed (print, database) |
||
| return err | ||
| } | ||
|
|
||
| func parseNode(n node, cli client) (nodeKey, nodePath, nodeChildren, hashvalue []byte, err error) { | ||
| switch n := n.(type) { | ||
| case *leafNode: | ||
| nodeKey = n.key | ||
| hashvalue, err = n.cacheNode.Hash(cli) | ||
| case *extensionNode: | ||
| nodePath = n.path | ||
| hashvalue, err = n.cacheNode.Hash(cli) | ||
| case *branchNode: | ||
| nodeChildren = n.indices.List() | ||
| hashvalue, err = n.cacheNode.Hash(cli) | ||
| default: | ||
| err = errors.Errorf("unknown node type %T", n) | ||
| } | ||
| return | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why is
loggingused at the end of function instead of at the head?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Wait for the
bnodeInitialized