M trie/nodes.pb.go

openacid · Nov 24, 2020 · 45c826e · 45c826e
1 parent 59f68a6
commit 45c826e
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 63 deletions.
diff --git a/trie/nodes.pb.go b/trie/nodes.pb.go
diff --git a/trie/nodes.proto b/trie/nodes.proto
@@ -64,12 +64,6 @@ message VLenArray {
 // Since 0.5.10
 message Nodes {
 
-    // WithPrefixContent indicates whether full inner prefixes are stored or only the
-    // lengths of inner prefix are stored.
-    //
-    // Since 0.5.10
-    bool WithPrefixContent = 9;
-
     // BigInnerCnt is number of big (267 bit) inner node.
     //
     // Since 0.5.10

diff --git a/trie/slimtrie.go b/trie/slimtrie.go
@@ -118,7 +118,7 @@ type Opt struct {
 	CompleteLeaf bool
 
 	// Complete tells SlimTrie to store complete keys content.
-	// This option implies "WithPrefixContent" and "WithLeafPrefix".
+	// This option implies "CompleteInner" and "CompleteLeaf".
 	// With this option there is no false positive and SlimTrie works just like
 	// a static key-value map.
 	//
@@ -179,7 +179,7 @@ func (st *SlimTrie) content() []string {
 	ns := st.nodes
 	rst = append(rst, fmt.Sprintf(`InnerBM: %+v`, bitmap.ToArray(ns.NodeTypeBM.Words)))
 	rst = append(rst, fmt.Sprintf(`StepBM: %+v`, bitmap.ToArray(ns.InnerPrefixes.PresenceBM.Words)))
-	if ns.WithPrefixContent {
+	if ns.InnerPrefixes.PositionBM != nil {
 		rst = append(rst, fmt.Sprintf(`PrefixStarts: %+v`, bitmap.ToArray(ns.InnerPrefixes.PositionBM.Words)))
 	} else {
 		rst = append(rst, fmt.Sprintf(`Steps: %+v`, ns.InnerPrefixLens))

diff --git a/trie/slimtrie_create.go b/trie/slimtrie_create.go
@@ -303,12 +303,11 @@ func (c *creator) build(e encode.Encoder) *SlimTrie {
 	_ = shortCnt
 
 	ns := &Nodes{
-		ShortSize:         shortSize,
-		ShortMask:         bitmap.Mask[shortSize],
-		ShortMinusInner:   shortSize - innerSize,
-		BigInnerOffset:    (bigInnerSize - innerSize) * c.bigCnt,
-		BigInnerCnt:       c.bigCnt,
-		WithPrefixContent: c.option.CompleteInner,
+		ShortSize:       shortSize,
+		ShortMask:       bitmap.Mask[shortSize],
+		ShortMinusInner: shortSize - innerSize,
+		BigInnerOffset:  (bigInnerSize - innerSize) * c.bigCnt,
+		BigInnerCnt:     c.bigCnt,
 	}
 
 	// Mapping most used 17-bit bitmap inner node to short inner node.

diff --git a/trie/slimtrie_query.go b/trie/slimtrie_query.go
@@ -456,7 +456,7 @@ func (st *SlimTrie) getInner(nodeid int32, qr *querySession) {
 		inn := ns.InnerPrefixes.PresenceBM
 		ithPref := rank128(inn.Words, inn.RankIndex, ithInner)
 
-		if ns.WithPrefixContent {
+		if ns.InnerPrefixes.PositionBM != nil {
 
 			// stored actual prefix of a node.
 			ps := ns.InnerPrefixes.PositionBM