Merge pull request #35 from absolute8511/update-pb

Update pb and handle pkg util import

.travis.yml

@@ -1,7 +1,7 @@
 language: go
 go:
-  - 1.7.x
   - 1.8.x
+  - 1.9.x
 env:
   - GOARCH=amd64 TEST_RACE=false
   - GOARCH=amd64 TEST_RACE=true

build-pb.sh

@@ -3,8 +3,10 @@ set -e
 GOGOROOT="${GOPATH}/src/github.com/gogo/protobuf"
 GOGOPATH="${GOGOROOT}:${GOGOROOT}/protobuf"
 DIRS="./node ./raft/raftpb ./snap/snappb ./wal/walpb ./rockredis"
+echo $GOROOT
+echo $GOPATH
 for dir in ${DIRS}; do
     pushd ${dir}
-        protoc --proto_path=$GOPATH:$GOGOPATH:./ --gogo_out=. *.proto
+        protoc --proto_path=$GOPATH:$GOGOPATH:./ --gofast_out=. *.proto
     popd
 done

node/node.go

@@ -26,7 +26,7 @@ import (
 	"github.com/absolute8511/ZanRedisDB/rockredis"
 	"github.com/absolute8511/ZanRedisDB/transport/rafthttp"
 	"github.com/absolute8511/redcon"
-	"github.com/coreos/etcd/pkg/wait"
+	"github.com/absolute8511/ZanRedisDB/pkg/wait"
 )
 
 var (

node/raft.go

@@ -28,15 +28,15 @@ import (
 	"sync/atomic"
 
 	"github.com/absolute8511/ZanRedisDB/common"
+	"github.com/absolute8511/ZanRedisDB/pkg/fileutil"
 	"github.com/absolute8511/ZanRedisDB/raft"
 	"github.com/absolute8511/ZanRedisDB/raft/raftpb"
 	"github.com/absolute8511/ZanRedisDB/snap"
 	"github.com/absolute8511/ZanRedisDB/transport/rafthttp"
 	"github.com/absolute8511/ZanRedisDB/wal"
 	"github.com/absolute8511/ZanRedisDB/wal/walpb"
-	"github.com/coreos/etcd/pkg/fileutil"
-	"github.com/coreos/etcd/pkg/idutil"
-	"github.com/coreos/etcd/pkg/types"
+	"github.com/absolute8511/ZanRedisDB/pkg/idutil"
+	"github.com/absolute8511/ZanRedisDB/pkg/types"
 	"golang.org/x/net/context"
 )
 
@@ -115,7 +115,7 @@ type raftNode struct {
 	newLeaderChan       chan string
 	lastLeaderChangedTs int64
 	stopping            int32
-	replayRunning  int32
+	replayRunning       int32
 }
 
 // newRaftNode initiates a raft instance and returns a committed log entry