change HasBit to GetBit

Author: Theodus

bitarray/bitmap.go

@@ -41,8 +41,8 @@ func (b Bitmap32) ClearBit(pos uint) Bitmap32 {
 	return b & ^(1 << pos)
 }
 
-// HasBit returns true if the bit at the given position in the Bitmap32 is 1
-func (b Bitmap32) HasBit(pos uint) bool {
+// GetBit returns true if the bit at the given position in the Bitmap32 is 1
+func (b Bitmap32) GetBit(pos uint) bool {
 	return (b & (1 << pos)) != 0
 }
 
@@ -70,8 +70,8 @@ func (b Bitmap64) ClearBit(pos uint) Bitmap64 {
 	return b & ^(1 << pos)
 }
 
-// HasBit returns true if the bit at the given position in the Bitmap64 is 1
-func (b Bitmap64) HasBit(pos uint) bool {
+// GetBit returns true if the bit at the given position in the Bitmap64 is 1
+func (b Bitmap64) GetBit(pos uint) bool {
 	return (b & (1 << pos)) != 0
 }
 

bitarray/bitmap_test.go

@@ -68,9 +68,9 @@ func TestBitmap32_ClearBit(t *testing.T) {
 	assert.Equal(t, Bitmap32(0), m.ClearBit(2))
 }
 
-func TestBitmap32_HasBit(t *testing.T) {
+func TestBitmap32_zGetBit(t *testing.T) {
 	m := Bitmap32(0x55555555)
-	assert.Equal(t, true, m.HasBit(2))
+	assert.Equal(t, true, m.GetBit(2))
 }
 
 func TestBitmap64_SetBit(t *testing.T) {
@@ -83,9 +83,9 @@ func TestBitmap64_ClearBit(t *testing.T) {
 	assert.Equal(t, Bitmap64(0), m.ClearBit(2))
 }
 
-func TestBitmap64_HasBit(t *testing.T) {
+func TestBitmap64_GetBit(t *testing.T) {
 	m := Bitmap64(0x55555555)
-	assert.Equal(t, true, m.HasBit(2))
+	assert.Equal(t, true, m.GetBit(2))
 }
 
 func BenchmarkBitmap32_PopCount(b *testing.B) {

trie/dtrie/dtrie.go

@@ -77,13 +77,13 @@ func (d *Dtrie) Size() (size int) {
 	return size
 }
 
-// Get returns the Entry for the associated key or returns nil if the
+// Get returns the value for the associated key or returns nil if the
 // key does not exist.
-func (d *Dtrie) Get(key interface{}) Entry {
-	return get(d.root, d.hasher(key), key)
+func (d *Dtrie) Get(key interface{}) interface{} {
+	return get(d.root, d.hasher(key), key).Value()
 }
 
-// Insert adds an entry to the Dtrie, replacing the existing value if
+// Insert adds a key value pair to the Dtrie, replacing the existing value if
 // the key already exists and returns the resulting Dtrie.
 func (d *Dtrie) Insert(key, value interface{}) *Dtrie {
 	root := insert(d.root, &entry{d.hasher(key), key, value})

trie/dtrie/dtrie_test.go

@@ -27,7 +27,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 package dtrie
 
 import (
-	"fmt"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -40,10 +39,6 @@ func TestDefaultHasher(t *testing.T) {
 	assert.NotEqual(t, defaultHasher("foo"), defaultHasher("bar"))
 }
 
-func (e *entry) String() string {
-	return fmt.Sprint(e.value)
-}
-
 func collisionHash(key interface{}) uint32 {
 	return uint32(0xffffffff) // for testing collisions
 }
@@ -121,7 +116,7 @@ func TestIterate(t *testing.T) {
 			close(stop)
 		}
 	}
-	assert.True(t, c > 99 && c < 102)
+	assert.True(t, c == 100)
 	// test with collisions
 	n = insertTest(t, collisionHash, 1000)
 	c = 0

trie/dtrie/node.go

@@ -80,7 +80,7 @@ func insert(n *node, entry Entry) *node {
 			newNode.dataMap = newNode.dataMap.SetBit(index)
 			return newNode
 		}
-		if newNode.dataMap.HasBit(index) {
+		if newNode.dataMap.GetBit(index) {
 			if newNode.entries[index].Key() == entry.Key() {
 				newNode.entries[index] = entry
 				return newNode
@@ -96,12 +96,12 @@ func insert(n *node, entry Entry) *node {
 		cNode.entries = append(cNode.entries, entry)
 		return newNode
 	}
-	if !newNode.dataMap.HasBit(index) && !newNode.nodeMap.HasBit(index) { // insert directly
+	if !newNode.dataMap.GetBit(index) && !newNode.nodeMap.GetBit(index) { // insert directly
 		newNode.entries[index] = entry
 		newNode.dataMap = newNode.dataMap.SetBit(index)
 		return newNode
 	}
-	if newNode.nodeMap.HasBit(index) { // insert into sub-node
+	if newNode.nodeMap.GetBit(index) { // insert into sub-node
 		newNode.entries[index] = insert(newNode.entries[index].(*node), entry)
 		return newNode
 	}
@@ -127,10 +127,10 @@ func insert(n *node, entry Entry) *node {
 // returns nil if not found
 func get(n *node, keyHash uint32, key interface{}) Entry {
 	index := uint(mask(keyHash, n.level))
-	if n.dataMap.HasBit(index) {
+	if n.dataMap.GetBit(index) {
 		return n.entries[index]
 	}
-	if n.nodeMap.HasBit(index) {
+	if n.nodeMap.GetBit(index) {
 		return get(n.entries[index].(*node), keyHash, key)
 	}
 	if n.level == 6 { // get from collisionNode
@@ -150,19 +150,19 @@ func get(n *node, keyHash uint32, key interface{}) Entry {
 func remove(n *node, keyHash uint32, key interface{}) *node {
 	index := uint(mask(keyHash, n.level))
 	newNode := n
-	if n.dataMap.HasBit(index) {
+	if n.dataMap.GetBit(index) {
 		newNode.entries[index] = nil
 		newNode.dataMap = newNode.dataMap.ClearBit(index)
 		return newNode
 	}
-	if n.nodeMap.HasBit(index) {
+	if n.nodeMap.GetBit(index) {
 		subNode := newNode.entries[index].(*node)
 		subNode = remove(subNode, keyHash, key)
 		// compress if only 1 entry exists in sub-node
 		if subNode.nodeMap.PopCount() == 0 && subNode.dataMap.PopCount() == 1 {
 			var e Entry
 			for i := uint(0); i < 32; i++ {
-				if subNode.dataMap.HasBit(i) {
+				if subNode.dataMap.GetBit(i) {
 					e = subNode.entries[i]
 					break
 				}
@@ -210,9 +210,9 @@ func pushEntries(n *node, stop <-chan struct{}, out chan Entry) {
 		default:
 			index := uint(i)
 			switch {
-			case n.dataMap.HasBit(index):
+			case n.dataMap.GetBit(index):
 				out <- e
-			case n.nodeMap.HasBit(index):
+			case n.nodeMap.GetBit(index):
 				wg.Add(1)
 				go func() {
 					defer wg.Done()