update badger version to a stable branch and change path to pingcap (#…

…399)

cmd/unistore-server/main.go

@@ -27,11 +27,11 @@ import (
 	"time"
 
 	"github.com/BurntSushi/toml"
-	"github.com/coocood/badger"
-	"github.com/coocood/badger/y"
 	"github.com/ngaut/unistore/config"
 	"github.com/ngaut/unistore/pd"
 	"github.com/ngaut/unistore/server"
+	"github.com/pingcap/badger"
+	"github.com/pingcap/badger/y"
 	"github.com/pingcap/kvproto/pkg/deadlock"
 	"github.com/pingcap/kvproto/pkg/tikvpb"
 	"github.com/pingcap/log"

config/config.go

@@ -16,7 +16,7 @@ package config
 import (
 	"time"
 
-	"github.com/coocood/badger/options"
+	"github.com/pingcap/badger/options"
 	"github.com/pingcap/log"
 )
 

go.mod

@@ -2,14 +2,14 @@ module github.com/ngaut/unistore
 
 require (
 	github.com/BurntSushi/toml v0.3.1
-	github.com/coocood/badger v1.5.1-0.20200528065104-c02ac3616d04
 	github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548
 	github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2
 	github.com/gogo/protobuf v1.3.1
 	github.com/golang/protobuf v1.3.4
 	github.com/google/btree v1.0.0
 	github.com/juju/errors v0.0.0-20181118221551-089d3ea4e4d5
 	github.com/pierrec/lz4 v2.0.5+incompatible
+	github.com/pingcap/badger v1.5.1-0.20200604041313-19c397305fcc
 	github.com/pingcap/check v0.0.0-20200212061837-5e12011dc712
 	github.com/pingcap/errors v0.11.5-0.20190809092503-95897b64e011
 	github.com/pingcap/kvproto v0.0.0-20200518112156-d4aeb467de29

go.sum

@@ -433,6 +433,8 @@ github.com/pierrec/lz4 v2.0.5+incompatible h1:2xWsjqPFWcplujydGg4WmhC/6fZqK42wMM
 github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
 github.com/pingcap-incubator/tidb-dashboard v0.0.0-20200407064406-b2b8ad403d01/go.mod h1:77fCh8d3oKzC5ceOJWeZXAS/mLzVgdZ7rKniwmOyFuo=
 github.com/pingcap-incubator/tidb-dashboard v0.0.0-20200514075710-eecc9a4525b5/go.mod h1:8q+yDx0STBPri8xS4A2duS1dAf+xO0cMtjwe0t6MWJk=
+github.com/pingcap/badger v1.5.1-0.20200604041313-19c397305fcc h1:aL83XYtYRGJHGruiw5Kk/vJiJl2xFiWfqCgnvHin7ek=
+github.com/pingcap/badger v1.5.1-0.20200604041313-19c397305fcc/go.mod h1:LyrqUOHZrUDf9oGi1yoz1+qw9ckSIhQb5eMa1acOLNQ=
 github.com/pingcap/br v0.0.0-20200426093517-dd11ae28b885 h1:gI14HoGBF9UyECMgqSRZx1ONhREtrZe8JCmZ/6OFilw=
 github.com/pingcap/br v0.0.0-20200426093517-dd11ae28b885/go.mod h1:4w3meMnk7HDNpNgjuRAxavruTeKJvUiXxoEWTjzXPnA=
 github.com/pingcap/br v0.0.0-20200521085655-53201addd4ad h1:nptiQT0kWdIUghh49OyaTBYb4DtdxJmsLHOxbU25kW4=

rocksdb/block_based_table_builder.go

@@ -26,8 +26,8 @@ import (
 	"math"
 	"os"
 
-	"github.com/coocood/badger/fileutil"
-	"github.com/coocood/badger/y"
+	"github.com/pingcap/badger/fileutil"
+	"github.com/pingcap/badger/y"
 )
 
 const (

rocksdb/block_builder.go

@@ -22,7 +22,7 @@
 
 package rocksdb
 
-import "github.com/coocood/badger/y"
+import "github.com/pingcap/badger/y"
 
 // 1-byte type + 32-bit crc
 const blockTrailerSize = 5

rocksdb/filter_builder.go

@@ -25,7 +25,7 @@ package rocksdb
 import (
 	"bytes"
 
-	"github.com/coocood/badger/y"
+	"github.com/pingcap/badger/y"
 )
 
 type fullFilterBlockBuilder struct {

rocksdb/sst_file_writer.go

@@ -37,7 +37,7 @@ package rocksdb
 import (
 	"os"
 
-	"github.com/coocood/badger/y"
+	"github.com/pingcap/badger/y"
 	"github.com/pingcap/errors"
 )
 

server/server.go

@@ -6,14 +6,14 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/coocood/badger"
-	"github.com/coocood/badger/options"
 	"github.com/ngaut/unistore/config"
 	"github.com/ngaut/unistore/lockstore"
 	"github.com/ngaut/unistore/pd"
 	"github.com/ngaut/unistore/tikv"
 	"github.com/ngaut/unistore/tikv/mvcc"
 	"github.com/ngaut/unistore/tikv/raftstore"
+	"github.com/pingcap/badger"
+	"github.com/pingcap/badger/options"
 )
 
 const (

tikv/analyze.go

@@ -30,10 +30,10 @@ import (
 	"math"
 	"time"
 
-	"github.com/coocood/badger/y"
 	"github.com/golang/protobuf/proto"
 	"github.com/juju/errors"
 	"github.com/ngaut/unistore/tikv/dbreader"
+	"github.com/pingcap/badger/y"
 	"github.com/pingcap/kvproto/pkg/coprocessor"
 	"github.com/pingcap/parser/ast"
 	"github.com/pingcap/parser/charset"

tikv/dbreader/db_reader.go

@@ -30,10 +30,10 @@ import (
 	"bytes"
 	"math"
 
-	"github.com/coocood/badger"
-	"github.com/coocood/badger/y"
 	"github.com/juju/errors"
 	"github.com/ngaut/unistore/tikv/mvcc"
+	"github.com/pingcap/badger"
+	"github.com/pingcap/badger/y"
 	"github.com/pingcap/kvproto/pkg/kvrpcpb"
 )
 

tikv/mock_region.go

@@ -7,13 +7,13 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/coocood/badger"
-	"github.com/coocood/badger/y"
 	"github.com/gogo/protobuf/proto"
 	"github.com/google/btree"
 	"github.com/juju/errors"
 	"github.com/ngaut/unistore/tikv/dbreader"
 	"github.com/ngaut/unistore/tikv/mvcc"
+	"github.com/pingcap/badger"
+	"github.com/pingcap/badger/y"
 	"github.com/pingcap/kvproto/pkg/errorpb"
 	"github.com/pingcap/kvproto/pkg/kvrpcpb"
 	"github.com/pingcap/kvproto/pkg/metapb"

tikv/mvcc.go

@@ -26,7 +26,6 @@ import (
 	"time"
 	"unsafe"
 
-	"github.com/coocood/badger"
 	"github.com/dgryski/go-farm"
 	"github.com/juju/errors"
 	"github.com/ngaut/unistore/config"
@@ -35,6 +34,7 @@ import (
 	"github.com/ngaut/unistore/tikv/dbreader"
 	"github.com/ngaut/unistore/tikv/mvcc"
 	"github.com/ngaut/unistore/util/lockwaiter"
+	"github.com/pingcap/badger"
 	"github.com/pingcap/kvproto/pkg/kvrpcpb"
 	"github.com/pingcap/log"
 	"github.com/pingcap/tidb/sessionctx/stmtctx"

tikv/mvcc/db_writer.go

@@ -16,8 +16,8 @@ package mvcc
 import (
 	"sync"
 
-	"github.com/coocood/badger"
 	"github.com/ngaut/unistore/lockstore"
+	"github.com/pingcap/badger"
 	"github.com/pingcap/kvproto/pkg/kvrpcpb"
 )
 

tikv/mvcc/tikv.go

@@ -14,7 +14,7 @@
 package mvcc
 
 import (
-	"github.com/coocood/badger/y"
+	"github.com/pingcap/badger/y"
 	"github.com/pingcap/errors"
 	"github.com/pingcap/kvproto/pkg/kvrpcpb"
 	"github.com/pingcap/tidb/util/codec"

tikv/mvcc_test.go

@@ -22,13 +22,13 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/coocood/badger"
-	"github.com/coocood/badger/y"
 	"github.com/ngaut/unistore/config"
 	"github.com/ngaut/unistore/lockstore"
 	"github.com/ngaut/unistore/tikv/mvcc"
 	"github.com/ngaut/unistore/tikv/raftstore"
 	"github.com/ngaut/unistore/util/lockwaiter"
+	"github.com/pingcap/badger"
+	"github.com/pingcap/badger/y"
 	. "github.com/pingcap/check"
 	"github.com/pingcap/kvproto/pkg/kvrpcpb"
 	"github.com/pingcap/kvproto/pkg/metapb"

tikv/raftstore/applier.go

@@ -18,11 +18,11 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/coocood/badger"
-	"github.com/coocood/badger/y"
 	"github.com/ngaut/unistore/tikv/dbreader"
 	"github.com/ngaut/unistore/tikv/mvcc"
 	"github.com/ngaut/unistore/tikv/raftstore/raftlog"
+	"github.com/pingcap/badger"
+	"github.com/pingcap/badger/y"
 	"github.com/pingcap/errors"
 	"github.com/pingcap/kvproto/pkg/eraftpb"
 	"github.com/pingcap/kvproto/pkg/kvrpcpb"

tikv/raftstore/bootstrap.go

@@ -16,9 +16,9 @@ package raftstore
 import (
 	"bytes"
 
-	"github.com/coocood/badger"
-	"github.com/coocood/badger/y"
 	"github.com/ngaut/unistore/tikv/dbreader"
+	"github.com/pingcap/badger"
+	"github.com/pingcap/badger/y"
 	"github.com/pingcap/errors"
 	"github.com/pingcap/kvproto/pkg/metapb"
 	rspb "github.com/pingcap/kvproto/pkg/raft_serverpb"

tikv/raftstore/db_writer.go

@@ -16,11 +16,11 @@ package raftstore
 import (
 	"time"
 
-	"github.com/coocood/badger/y"
 	"github.com/ngaut/unistore/config"
 	"github.com/ngaut/unistore/metrics"
 	"github.com/ngaut/unistore/tikv/mvcc"
 	"github.com/ngaut/unistore/tikv/raftstore/raftlog"
+	"github.com/pingcap/badger/y"
 	"github.com/pingcap/errors"
 	"github.com/pingcap/kvproto/pkg/errorpb"
 	"github.com/pingcap/kvproto/pkg/kvrpcpb"

tikv/raftstore/db_writer_test.go

@@ -20,8 +20,8 @@ import (
 
 	"github.com/ngaut/unistore/tikv/raftstore/raftlog"
 
-	"github.com/coocood/badger"
 	"github.com/ngaut/unistore/tikv/mvcc"
+	"github.com/pingcap/badger"
 	"github.com/pingcap/kvproto/pkg/kvrpcpb"
 	rfpb "github.com/pingcap/kvproto/pkg/raft_cmdpb"
 	"github.com/stretchr/testify/assert"

tikv/raftstore/engine.go

@@ -19,14 +19,14 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/coocood/badger"
-	"github.com/coocood/badger/y"
 	"github.com/cznic/mathutil"
 	"github.com/golang/protobuf/proto"
 	"github.com/ngaut/unistore/lockstore"
 	"github.com/ngaut/unistore/metrics"
 	"github.com/ngaut/unistore/tikv/dbreader"
 	"github.com/ngaut/unistore/tikv/mvcc"
+	"github.com/pingcap/badger"
+	"github.com/pingcap/badger/y"
 	"github.com/pingcap/errors"
 	"github.com/pingcap/kvproto/pkg/raft_serverpb"
 )

tikv/raftstore/fsm_peer.go

@@ -20,8 +20,8 @@ import (
 
 	"github.com/ngaut/unistore/tikv/raftstore/raftlog"
 
-	"github.com/coocood/badger/y"
 	"github.com/ngaut/unistore/tikv/mvcc"
+	"github.com/pingcap/badger/y"
 	"github.com/pingcap/errors"
 	"github.com/pingcap/kvproto/pkg/eraftpb"
 	"github.com/pingcap/kvproto/pkg/metapb"

tikv/raftstore/fsm_store.go

@@ -23,12 +23,12 @@ import (
 	"github.com/ngaut/unistore/config"
 	"github.com/ngaut/unistore/tikv/raftstore/raftlog"
 
-	"github.com/coocood/badger"
-	"github.com/coocood/badger/y"
 	"github.com/ngaut/unistore/lockstore"
 	"github.com/ngaut/unistore/pd"
 	"github.com/ngaut/unistore/rocksdb"
 	"github.com/ngaut/unistore/tikv/dbreader"
+	"github.com/pingcap/badger"
+	"github.com/pingcap/badger/y"
 	"github.com/pingcap/errors"
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/kvproto/pkg/pdpb"

tikv/raftstore/keys.go

@@ -17,7 +17,7 @@ import (
 	"bytes"
 	"encoding/binary"
 
-	"github.com/coocood/badger/y"
+	"github.com/pingcap/badger/y"
 	"github.com/pingcap/errors"
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/tidb/util/codec"

tikv/raftstore/node.go

@@ -18,9 +18,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/coocood/badger"
 	"github.com/golang/protobuf/proto"
 	"github.com/ngaut/unistore/pd"
+	"github.com/pingcap/badger"
 	"github.com/pingcap/errors"
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/kvproto/pkg/pdpb"

tikv/raftstore/peer_storage.go

@@ -20,11 +20,11 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/coocood/badger"
-	"github.com/coocood/badger/y"
 	"github.com/cznic/mathutil"
 	"github.com/golang/protobuf/proto"
 	"github.com/ngaut/unistore/tikv/dbreader"
+	"github.com/pingcap/badger"
+	"github.com/pingcap/badger/y"
 	"github.com/pingcap/errors"
 	"github.com/pingcap/kvproto/pkg/eraftpb"
 	"github.com/pingcap/kvproto/pkg/metapb"

tikv/raftstore/peer_storage_test.go

@@ -18,7 +18,7 @@ import (
 	"math"
 	"testing"
 
-	"github.com/coocood/badger"
+	"github.com/pingcap/badger"
 	"github.com/pingcap/kvproto/pkg/eraftpb"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

tikv/raftstore/restore.go

@@ -16,9 +16,9 @@ package raftstore
 import (
 	"encoding/binary"
 
-	"github.com/coocood/badger"
 	"github.com/ngaut/unistore/lockstore"
 	"github.com/ngaut/unistore/tikv/mvcc"
+	"github.com/pingcap/badger"
 	"github.com/pingcap/kvproto/pkg/eraftpb"
 	"github.com/pingcap/kvproto/pkg/raft_cmdpb"
 	"github.com/pingcap/log"

tikv/raftstore/snap.go

@@ -25,9 +25,9 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/coocood/badger/table/sstable"
-	"github.com/coocood/badger/y"
 	"github.com/ngaut/unistore/tikv/mvcc"
+	"github.com/pingcap/badger/table"
+	"github.com/pingcap/badger/y"
 
 	"github.com/ngaut/unistore/rocksdb"
 	"github.com/ngaut/unistore/util"
@@ -108,11 +108,11 @@ type ApplyOptions struct {
 	DBBundle *mvcc.DBBundle
 	Region   *metapb.Region
 	Abort    *uint32
-	Builder  *sstable.Builder
+	Builder  *table.Builder
 	WB       *WriteBatch
 }
 
-func newApplyOptions(db *mvcc.DBBundle, region *metapb.Region, abort *uint32, builder *sstable.Builder, wb *WriteBatch) *ApplyOptions {
+func newApplyOptions(db *mvcc.DBBundle, region *metapb.Region, abort *uint32, builder *table.Builder, wb *WriteBatch) *ApplyOptions {
 	return &ApplyOptions{
 		DBBundle: db,
 		Region:   region,

tikv/raftstore/snap_applier.go

@@ -18,9 +18,9 @@ import (
 	"io/ioutil"
 	"os"
 
-	"github.com/coocood/badger/y"
 	"github.com/ngaut/unistore/rocksdb"
 	"github.com/ngaut/unistore/tikv/mvcc"
+	"github.com/pingcap/badger/y"
 	"github.com/pingcap/errors"
 	"github.com/pingcap/kvproto/pkg/kvrpcpb"
 	"github.com/pingcap/tidb/util/codec"

tikv/raftstore/snap_builder.go

@@ -18,10 +18,10 @@ import (
 	"math"
 	"os"
 
-	"github.com/coocood/badger"
 	"github.com/ngaut/unistore/lockstore"
 	"github.com/ngaut/unistore/rocksdb"
 	"github.com/ngaut/unistore/tikv/mvcc"
+	"github.com/pingcap/badger"
 	"github.com/pingcap/errors"
 	"github.com/pingcap/kvproto/pkg/kvrpcpb"
 	"github.com/pingcap/kvproto/pkg/metapb"

tikv/raftstore/snap_codec.go

@@ -14,7 +14,7 @@
 package raftstore
 
 import (
-	"github.com/coocood/badger/y"
+	"github.com/pingcap/badger/y"
 	"github.com/pingcap/errors"
 	"github.com/pingcap/tidb/util/codec"
 )