CovenantSQL · auxten · May 2, 2018 · Apr 18, 2018 · Apr 18, 2018 · Apr 18, 2018
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,8 @@
 coverage.txt
+analysisVendor.png
 
 # Binaries for programs and plugins
+bin/
 *.exe
 *.dll
 *.so

diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 env:
   global:
-    - secure: "dld6R6RF3Mtjs94cBj94eg1phi/34objqKlZI64A+mI68J5yXTxoLRJJMZrzM63YQ8wbvvF+W68KDyjXvYaQXTFES/p+igx5UsQ3SQ7GtRuqjXkCWI0hVqRphFWeeWPWEactFmwIK/hap2dvcBIP0sIU100EE/Cx6Lo0FFkmMb664wA+by4ELFo0l3h7pPfklyVAAWY+GYp9jeLT8/7VT7aDqASUh+3znd7NBgokXkCAwOVNTKI5H0eHIyW5aM9vBKJvTuTTpZ51rAA7tUUMOvihh2Hltmxy6rBfyApUCfMDWTrdKnhttXKDuHvL2vh+GzTD1cl6HAo+owYP6YkGPuA40FfmgBB8DtoAIvCY0jU0hwkkZAh2uXHjthNUFDOGY26ZkuL+l/T5TxQEqe3WgIG2MoVUCrc9L+XqsmTuM3ERS3gdusmjSc/WwQDpy3DLkc5W2zokcgmolmGnaFkxqwifsCTK3Ifzr8yKsSWZHXQadRRI43dmxua3b4WNFAY/lsF6yrbRyWY9LtWwTjbdheoMOIH6mE1daHIXKN1T5xPwPK4EW99Y1jDdJHdpWc2zYHnkEm8H9CJ9+KuAMADB9813XDBkcXRtvLtJckhdGPmkKrqJ3WHnMGT/D4ErMWPAY6+oawruizReDmvi3KA3Emp2VDfleAe0pCsyDwwqCKw="
+    - secure: "CNZXODvXHMB0z6Z+Jd8MjzP+RYgRzkykRNpZdCDCo6AC57BpV5U20Mn9o2MGhTA9lMgtyNXXEaQxeIGZMFp3iB2UHiPif1UD4C0uDttytTuCcmHMlBIVP8GiNcAexi1Zv2SchM1k8z3tw5zDhkYMwjs/4ZsGVXHa1ip/UzpZaJBPl9D64wedJxZGBjS/Kn9IZTrMkL2otr8rKk0ZFMtwDkHKdjfikZ+PAlkYpX2a2Dp69HTLbEtx+ugocNj02hzgVYNpFXA1K0CulyCYJq7oqdx0UFbtKEd3urYFWfmxEZSg6SoHcIujC+/BKfZELFyA3uomp+cLpGaRlEp/iAlj/ixTo4iFtu6XdDOim4J9ZVtNSg6DdDstL9uhxCu+vca/ntViGfyw6CF0hKcHTZvlH2awiV1njmHFdRvoaMy/1fdw1JAV9O7ylU3bV5GrF6fMQ1CpweYCnF3IMpvvwdeUnGR6NPvqjybcnyXoTXZ139PxfWzbUzSG8KbOvzt1aVhWF5184b8fqhN3768Y1stke+FjFpARqlPVsfzS7fnn5kx8zZ5nfmwZjnL/WFob24mvm+/9e7IsfWmeEQdFspD+spBE4WOta7tegqh5ANNfM2owd9evtH5kqlCLeAVD3LMs69ZQW45KS0rDJpY8+ffMWRJRmoM/pweW3CmbHPeb468="
     - REVIEWDOG_VERSION=0.9.8
 language: go
 go:
@@ -32,4 +32,4 @@ script:
   - go test -v -race $(go list ./... | grep -v "/vendor/")
   - goverage -coverprofile=coverage.txt ./...
   - >-
-    golint ./... | reviewdog -f=golint -ci=travis
+    golint ./... | grep -v 'vendor/' | grep -v 'server/' | grep -v 'utils/' | reviewdog -f=golint -ci=travis
diff --git a/analysisVendor.sh b/analysisVendor.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+dep ensure
+dep status -dot | dot -Tpng -o analysisVendor.png && open analysisVendor.png
diff --git a/consistent/consistent_test.go b/consistent/consistent_test.go
@@ -5,9 +5,7 @@
 package consistent
 
 import (
-	"bufio"
 	"math/rand"
-	"os"
 	"runtime"
 	"sort"
 	"strconv"
@@ -56,6 +54,15 @@ func TestRemove(t *testing.T) {
 	utils.CheckNum(len(x.sortedHashes), 0, t)
 }
 
+func TestMembers(t *testing.T) {
+	x := New()
+	x.Add(NewNodeFromID("abcdefg"))
+	x.Add(NewNodeFromID("abcdefghi"))
+	x.Remove(NewNodeFromID("abcdefg"))
+	utils.CheckNum(len(x.Members()), 1, t)
+	utils.CheckStr(string(x.Members()[0].ID), "abcdefghi", t)
+}
+
 func TestRemoveNonExisting(t *testing.T) {
 	x := New()
 	x.Add(NewNodeFromID("abcdefg"))
@@ -215,6 +222,14 @@ func TestGetTwo(t *testing.T) {
 	}
 }
 
+func TestGetTwoEmpty(t *testing.T) {
+	x := New()
+	_, _, err := x.GetTwo("9999999")
+	if err != ErrEmptyCircle {
+		t.Fatal(err)
+	}
+}
+
 func TestGetTwoQuick(t *testing.T) {
 	x := New()
 	x.Add(NewNodeFromID("abcdefg"))
@@ -360,6 +375,17 @@ func TestGetNMore(t *testing.T) {
 	}
 }
 
+func TestGetNEmpty(t *testing.T) {
+	x := New()
+	members, err := x.GetN("9999999", 5)
+	if err != ErrEmptyCircle {
+		t.Fatal(err)
+	}
+	if len(members) != 0 {
+		t.Errorf("expected 3 members instead of %d", len(members))
+	}
+}
+
 func TestGetNQuick(t *testing.T) {
 	x := New()
 	x.Add(NewNodeFromID("abcdefg"))
@@ -675,35 +701,35 @@ func TestAddCollision(t *testing.T) {
 	}
 }
 
-// inspired by @or-else on github
-func TestCollisionsCRC(t *testing.T) {
-	t.SkipNow()
-	c := New()
-	f, err := os.Open("/usr/share/dict/words")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer f.Close()
-	found := make(map[NodeKey]string)
-	scanner := bufio.NewScanner(f)
-	count := 0
-	for scanner.Scan() {
-		word := scanner.Text()
-		for i := 0; i < c.NumberOfReplicas; i++ {
-			ekey := c.nodeKey(NodeID(word), i)
-			// ekey := word + "|" + strconv.Itoa(i)
-			k := c.hashKey(ekey)
-			exist, ok := found[k]
-			if ok {
-				t.Logf("found collision: %v, %v", ekey, exist)
-				count++
-			} else {
-				found[k] = ekey
-			}
-		}
-	}
-	t.Logf("number of collisions: %d", count)
-}
+//// inspired by @or-else on github
+//func TestCollisionsCRC(t *testing.T) {
+//	t.SkipNow()
+//	c := New()
+//	f, err := os.Open("/usr/share/dict/words")
+//	if err != nil {
+//		t.Fatal(err)
+//	}
+//	defer f.Close()
+//	found := make(map[NodeKey]string)
+//	scanner := bufio.NewScanner(f)
+//	count := 0
+//	for scanner.Scan() {
+//		word := scanner.Text()
+//		for i := 0; i < c.NumberOfReplicas; i++ {
+//			ekey := c.nodeKey(NodeID(word), i)
+//			// ekey := word + "|" + strconv.Itoa(i)
+//			k := c.hashKey(ekey)
+//			exist, ok := found[k]
+//			if ok {
+//				t.Logf("found collision: %v, %v", ekey, exist)
+//				count++
+//			} else {
+//				found[k] = ekey
+//			}
+//		}
+//	}
+//	t.Logf("number of collisions: %d", count)
+//}
 
 func TestConcurrentGetSet(t *testing.T) {
 	x := New()

diff --git a/proto/proto.go b/proto/proto.go
@@ -1,5 +1,9 @@
 package proto
 
+import (
+	"time"
+)
+
 // NodeID is node name, will be generated from Hash(nodePublicKey)
 type NodeID string
 
@@ -14,3 +18,40 @@ type Node struct {
 	ID        NodeID
 	PublicKey string
 }
+
+// Envelope is the protocol
+type Envelope struct {
+	Version string
+	TTL     time.Duration
+	Expire  time.Duration
+}
+
+// PingReq is Ping RPC request
+type PingReq struct {
+	Node    Node
+	Version string
+	Envelope
+}
+
+// PingResp is Ping RPC response, i.e. Pong
+type PingResp struct {
+	Msg     string
+	Version string
+	Envelope
+}
+
+// FindValueReq is FindValue RPC request
+type FindValueReq struct {
+	NodeID  NodeID
+	Count   int
+	Version string
+	Envelope
+}
+
+// FindValueResp is FindValue RPC response
+type FindValueResp struct {
+	Nodes   []Node
+	Msg     string
+	Version string
+	Envelope
+}
diff --git a/route/dht_test.go b/route/dht_test.go
@@ -2,14 +2,14 @@ package route
 
 import (
 	log "github.com/sirupsen/logrus"
-	"github.com/thunderdb/ThunderDB/proto"
+	. "github.com/smartystreets/goconvey/convey"
+	. "github.com/thunderdb/ThunderDB/proto"
 	"github.com/thunderdb/ThunderDB/rpc"
-	"github.com/thunderdb/ThunderDB/utils"
 	"net"
 	"testing"
 )
 
-func TestGetNeighbors(t *testing.T) {
+func TestPingFindValue(t *testing.T) {
 	log.SetLevel(log.DebugLevel)
 	addr := "127.0.0.1:0"
 	l, err := net.Listen("tcp", addr)
@@ -29,29 +29,48 @@ func TestGetNeighbors(t *testing.T) {
 		log.Fatal(err)
 	}
 
-	reqA := &AddNodeReq{
-		Node: proto.Node{
+	reqA := &PingReq{
+		Node: Node{
 			ID: "node1",
 		},
 	}
-	respA := new(AddNodeResp)
-	err = client.Call("DHT.AddNode", reqA, respA)
+	respA := new(PingResp)
+	err = client.Call("DHT.Ping", reqA, respA)
 	if err != nil {
 		log.Fatal(err)
 	}
 	log.Debugf("respA: %v", respA)
 
-	req := &GetNeighborsReq{
-		nodeID: "123",
+	reqB := &PingReq{
+		Node: Node{
+			ID: "node2",
+		},
+	}
+	respB := new(PingResp)
+	err = client.Call("DHT.Ping", reqB, respB)
+	if err != nil {
+		log.Fatal(err)
+	}
+	log.Debugf("respA: %v", respB)
+
+	req := &FindValueReq{
+		NodeID: "123",
 		Count:  2,
 	}
-	resp := new(GetNeighborsResp)
-	err = client.Call("DHT.GetNeighbors", req, resp)
+	resp := new(FindValueResp)
+	err = client.Call("DHT.FindValue", req, resp)
 	if err != nil {
 		log.Fatal(err)
 	}
 	log.Debugf("resp: %v", resp)
-	utils.CheckStr(string(resp.Nodes[0].ID), "node1", t)
+	nodeIDList := []string{
+		string(resp.Nodes[0].ID),
+		string(resp.Nodes[1].ID),
+	}
+	Convey("test FindValue", t, func() {
+		So(nodeIDList, ShouldContain, "node1")
+		So(nodeIDList, ShouldContain, "node2")
+	})
 
 	client.Close()
 	dhtServer.Stop()

diff --git a/route/service.go b/route/service.go
@@ -2,7 +2,7 @@ package route
 
 import (
 	"fmt"
-	"github.com/opentracing/opentracing-go/log"
+	log "github.com/sirupsen/logrus"
 	"github.com/thunderdb/ThunderDB/consistent"
 	"github.com/thunderdb/ThunderDB/proto"
 )
@@ -20,44 +20,20 @@ func NewDHTService() *DHTService {
 	}
 }
 
-// GetNeighborsReq is GetNeighbors RPC request
-type GetNeighborsReq struct {
-	nodeID  proto.NodeID
-	Count   int
-	Version string
-}
-
-// GetNeighborsResp is GetNeighbors RPC response
-type GetNeighborsResp struct {
-	Nodes   []proto.Node
-	ErrMsg  string
-	Version string
-}
-
-// GetNeighbors RPC returns GetNeighborsReq.Count closest node from consistent hash ring
-func (DHT *DHTService) GetNeighbors(req *GetNeighborsReq, resp *GetNeighborsResp) (err error) {
-	resp.Nodes, err = DHT.hashRing.GetN(string(req.nodeID), req.Count)
+// FindValue RPC returns FindValueReq.Count closest node from DHT
+func (DHT *DHTService) FindValue(req *proto.FindValueReq, resp *proto.FindValueResp) (err error) {
+	resp.Nodes, err = DHT.hashRing.GetN(string(req.NodeID), req.Count)
 	if err != nil {
 		log.Error(err)
-		resp.ErrMsg = fmt.Sprint(err)
+		resp.Msg = fmt.Sprint(err)
 	}
 	return
 }
 
-// AddNodeReq is AddNode RPC request
-type AddNodeReq struct {
-	Node    proto.Node
-	Version string
-}
-
-// AddNodeResp is AddNode RPC response
-type AddNodeResp struct {
-	ErrMsg  string
-	Version string
-}
-
-// AddNode RPC add AddNodeReq.Node to consistent hash ring
-func (DHT *DHTService) AddNode(req *AddNodeReq, resp *AddNodeResp) (err error) {
+// Ping RPC add PingReq.Node to DHT
+func (DHT *DHTService) Ping(req *proto.PingReq, resp *proto.PingResp) (err error) {
 	DHT.hashRing.Add(req.Node)
+	resp = new(proto.PingResp)
+	resp.Msg = "Pong"
 	return
 }
diff --git a/vendor/github.com/gopherjs/gopherjs/LICENSE b/vendor/github.com/gopherjs/gopherjs/LICENSE