Ready to open source on github

* Rename package abs path * Remove pd-addrs in conf
xiaojunhong · Nov 14, 2018 · 5c9842a · 5c9842a
1 parent 0ac2b3f
commit 5c9842a
Show file tree

Hide file tree

Showing 35 changed files with 66 additions and 67 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -5,16 +5,16 @@ RUN apk add --no-cache \
     make \
     git
 
-COPY . /go/src/gitlab.meitu.com/platform/titan
+COPY . /go/src/github.com/meitu/titan
 
-WORKDIR /go/src/gitlab.meitu.com/platform/titan
+WORKDIR /go/src/github.com/meitu/titan
 
 RUN env GOOS=linux CGO_ENABLED=0 go build ./bin/titan/  
 
 ## Executable image
 FROM scratch
 
-COPY --from=builder /go/src/gitlab.meitu.com/platform/titan/titan /titan
+COPY --from=builder /go/src/github.com/meitu/titan/titan /titan
 
 WORKDIR /
 

diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 PROJECT_NAME := titan
-PKG := gitlab.meitu.com/platform/$(PROJECT_NAME)
+PKG := github.com/meitu/$(PROJECT_NAME)
 PKG_LIST := $(shell go list ${PKG}/... | grep -v /vendor/)
 GITHASH := $(shell git rev-parse --short HEAD)
 GO_FILES := $(shell find . -name '*.go' | grep -v /vendor/ | grep -v _test.go)

diff --git a/README.md b/README.md
@@ -1,7 +1,6 @@
-# Titan [![build status](https://gitlab.meitu.com/platform/titan/badges/dev/build.svg)](https://gitlab.meitu.com/platform/titan/commits/dev) [![coverage report](https://gitlab.meitu.com/platform/titan/badges/dev/coverage.svg)](https://gitlab.meitu.com/platform/titan/commits/dev)
-An distributed implementation of Redis compatible layer over TiKV
+# Titan
 
-Visit [Titan](http://cf.meitu.com/confluence/pages/viewpage.action?pageId=29745824) for more informations.
+An distributed implementation of Redis compatible layer over TiKV
 
 ## Commands
 

diff --git a/bin/titan/main.go b/bin/titan/main.go
@@ -17,11 +17,11 @@ import (
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 
-	"gitlab.meitu.com/platform/titan"
-	"gitlab.meitu.com/platform/titan/conf"
-	"gitlab.meitu.com/platform/titan/context"
-	"gitlab.meitu.com/platform/titan/db"
-	"gitlab.meitu.com/platform/titan/metrics"
+	"github.com/meitu/titan"
+	"github.com/meitu/titan/conf"
+	"github.com/meitu/titan/context"
+	"github.com/meitu/titan/db"
+	"github.com/meitu/titan/metrics"
 )
 
 func main() {

diff --git a/client.go b/client.go
@@ -7,9 +7,9 @@ import (
 	"strings"
 	"time"
 
-	"gitlab.meitu.com/platform/titan/command"
-	"gitlab.meitu.com/platform/titan/context"
-	"gitlab.meitu.com/platform/titan/encoding/resp"
+	"github.com/meitu/titan/command"
+	"github.com/meitu/titan/context"
+	"github.com/meitu/titan/encoding/resp"
 	"go.uber.org/zap"
 )
 

diff --git a/command/command.go b/command/command.go
@@ -7,10 +7,10 @@ import (
 	"time"
 
 	"github.com/shafreeck/retry"
-	"gitlab.meitu.com/platform/titan/context"
-	"gitlab.meitu.com/platform/titan/db"
-	"gitlab.meitu.com/platform/titan/encoding/resp"
-	"gitlab.meitu.com/platform/titan/metrics"
+	"github.com/meitu/titan/context"
+	"github.com/meitu/titan/db"
+	"github.com/meitu/titan/encoding/resp"
+	"github.com/meitu/titan/metrics"
 	"go.uber.org/zap"
 )
 

diff --git a/command/connection.go b/command/connection.go
@@ -3,8 +3,8 @@ package command
 import (
 	"strconv"
 
-	"gitlab.meitu.com/platform/titan/encoding/resp"
-	"gitlab.meitu.com/platform/titan/metrics"
+	"github.com/meitu/titan/encoding/resp"
+	"github.com/meitu/titan/metrics"
 )
 
 // Auth verifies the client

diff --git a/command/hashes.go b/command/hashes.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"strconv"
 
-	"gitlab.meitu.com/platform/titan/db"
+	"github.com/meitu/titan/db"
 )
 
 // HDel removes the specified fields from the hash stored at key

diff --git a/command/keys.go b/command/keys.go
@@ -8,8 +8,8 @@ import (
 	"strings"
 	"time"
 
-	"gitlab.meitu.com/platform/titan/db"
-	"gitlab.meitu.com/platform/titan/encoding/resp"
+	"github.com/meitu/titan/db"
+	"github.com/meitu/titan/encoding/resp"
 )
 
 const (

diff --git a/command/lists.go b/command/lists.go
@@ -5,7 +5,7 @@ import (
 	"strconv"
 	"strings"
 
-	"gitlab.meitu.com/platform/titan/db"
+	"github.com/meitu/titan/db"
 )
 
 var (

diff --git a/command/server.go b/command/server.go
@@ -9,9 +9,9 @@ import (
 	"strings"
 	"time"
 
-	"gitlab.meitu.com/platform/titan/context"
-	"gitlab.meitu.com/platform/titan/db"
-	"gitlab.meitu.com/platform/titan/encoding/resp"
+	"github.com/meitu/titan/context"
+	"github.com/meitu/titan/db"
+	"github.com/meitu/titan/encoding/resp"
 )
 
 const sysAdminNamespace = "$sys.admin"

diff --git a/command/server_test.go b/command/server_test.go
@@ -8,8 +8,8 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/assert"
-	"gitlab.meitu.com/platform/titan/context"
-	"gitlab.meitu.com/platform/titan/db"
+	"github.com/meitu/titan/context"
+	"github.com/meitu/titan/db"
 )
 
 func TestInfo(t *testing.T) {

diff --git a/command/sets.go b/command/sets.go
@@ -1,7 +1,7 @@
 package command
 
 import (
-	"gitlab.meitu.com/platform/titan/db"
+	"github.com/meitu/titan/db"
 )
 
 // SAdd adds the specified members to the set stored at key

diff --git a/command/strings.go b/command/strings.go
@@ -5,7 +5,7 @@ import (
 	"strconv"
 	"time"
 
-	"gitlab.meitu.com/platform/titan/db"
+	"github.com/meitu/titan/db"
 )
 
 var (

diff --git a/command/test_test.go b/command/test_test.go
@@ -5,10 +5,10 @@ import (
 	"io"
 	"strings"
 
-	"gitlab.meitu.com/platform/titan/conf"
-	"gitlab.meitu.com/platform/titan/context"
-	"gitlab.meitu.com/platform/titan/db"
-	"gitlab.meitu.com/platform/titan/db/store"
+	"github.com/meitu/titan/conf"
+	"github.com/meitu/titan/context"
+	"github.com/meitu/titan/db"
+	"github.com/meitu/titan/db/store"
 )
 
 var cfg = &conf.Tikv{

diff --git a/command/transactions.go b/command/transactions.go
@@ -5,9 +5,9 @@ import (
 	"strings"
 	"time"
 
-	"gitlab.meitu.com/platform/titan/db"
-	"gitlab.meitu.com/platform/titan/encoding/resp"
-	"gitlab.meitu.com/platform/titan/metrics"
+	"github.com/meitu/titan/db"
+	"github.com/meitu/titan/encoding/resp"
+	"github.com/meitu/titan/metrics"
 	"go.uber.org/zap"
 )
 

diff --git a/conf/titan.toml b/conf/titan.toml
@@ -27,7 +27,7 @@ auth = ""
 #rules:       nonempty
 #description: pd address in tidb
 #required
-pd-addrs = "tikv://172.16.201.74:2379"
+pd-addrs = ""
 
 [server.tikv.zt]
 

diff --git a/context/context.go b/context/context.go
@@ -6,7 +6,7 @@ import (
 	"sync"
 	"time"
 
-	"gitlab.meitu.com/platform/titan/db"
+	"github.com/meitu/titan/db"
 )
 
 const (

diff --git a/db/db.go b/db/db.go
@@ -11,9 +11,9 @@ import (
 
 	"go.uber.org/zap"
 
-	"gitlab.meitu.com/platform/titan/conf"
-	"gitlab.meitu.com/platform/titan/db/store"
-	"gitlab.meitu.com/platform/titan/metrics"
+	"github.com/meitu/titan/conf"
+	"github.com/meitu/titan/db/store"
+	"github.com/meitu/titan/metrics"
 )
 
 var (

diff --git a/db/expire.go b/db/expire.go
@@ -5,7 +5,7 @@ import (
 	"context"
 	"time"
 
-	"gitlab.meitu.com/platform/titan/db/store"
+	"github.com/meitu/titan/db/store"
 
 	"go.uber.org/zap"
 )

diff --git a/db/gc.go b/db/gc.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"time"
 
-	"gitlab.meitu.com/platform/titan/db/store"
-	"gitlab.meitu.com/platform/titan/metrics"
+	"github.com/meitu/titan/db/store"
+	"github.com/meitu/titan/metrics"
 	"go.uber.org/zap"
 )
 

diff --git a/db/kv.go b/db/kv.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"math/rand"
 
-	"gitlab.meitu.com/platform/titan/db/store"
+	"github.com/meitu/titan/db/store"
 )
 
 // Kv supplies key releated operations

diff --git a/db/llist.go b/db/llist.go
@@ -6,7 +6,7 @@ import (
 	"math"
 	"time"
 
-	"gitlab.meitu.com/platform/titan/metrics"
+	"github.com/meitu/titan/metrics"
 
 	"github.com/pingcap/tidb/kv"
 )

diff --git a/db/zlist.go b/db/zlist.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 
 	"github.com/golang/protobuf/proto"
-	pb "gitlab.meitu.com/platform/titan/db/zlistproto"
+	pb "github.com/meitu/titan/db/zlistproto"
 )
 
 // GetZList generate List objectm with auto reation, if zip is true, zipped list will be choose

diff --git a/db/ztransfer.go b/db/ztransfer.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"time"
 
-	"gitlab.meitu.com/platform/titan/conf"
-	"gitlab.meitu.com/platform/titan/metrics"
+	"github.com/meitu/titan/conf"
+	"github.com/meitu/titan/metrics"
 	"go.uber.org/zap"
 )
 

diff --git a/metrics/server.go b/metrics/server.go
@@ -9,7 +9,7 @@ import (
 
 	"time"
 
-	"gitlab.meitu.com/platform/titan/conf"
+	"github.com/meitu/titan/conf"
 )
 
 //Server status server

diff --git a/metrics/server_test.go b/metrics/server_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"gitlab.meitu.com/platform/titan/conf"
+	"github.com/meitu/titan/conf"
 )
 
 var (

diff --git a/titan.go b/titan.go
@@ -4,9 +4,9 @@ import (
 	"net"
 	"time"
 
-	"gitlab.meitu.com/platform/titan/command"
-	"gitlab.meitu.com/platform/titan/context"
-	"gitlab.meitu.com/platform/titan/metrics"
+	"github.com/meitu/titan/command"
+	"github.com/meitu/titan/context"
+	"github.com/meitu/titan/metrics"
 	"go.uber.org/zap"
 )
 

diff --git a/tools/autotest/abnormal.go b/tools/autotest/abnormal.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/gomodule/redigo/redis"
-	"gitlab.meitu.com/platform/titan/tools/autotest/cmd"
+	"github.com/meitu/titan/tools/autotest/cmd"
 )
 
 //Abnormal check error message

diff --git a/tools/autotest/auto.go b/tools/autotest/auto.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"gitlab.meitu.com/platform/titan/tools/autotest/cmd"
+	"github.com/meitu/titan/tools/autotest/cmd"
 
 	"github.com/gomodule/redigo/redis"
 )

diff --git a/tools/autotest/main_test.go b/tools/autotest/main_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"gitlab.meitu.com/platform/titan/tools/integration"
+	"github.com/meitu/titan/tools/integration"
 )
 
 var (

diff --git a/tools/integration/titan.go b/tools/integration/titan.go
@@ -7,10 +7,10 @@ import (
 
 	"go.uber.org/zap"
 
-	"gitlab.meitu.com/platform/titan"
-	"gitlab.meitu.com/platform/titan/conf"
-	"gitlab.meitu.com/platform/titan/context"
-	"gitlab.meitu.com/platform/titan/db"
+	"github.com/meitu/titan"
+	"github.com/meitu/titan/conf"
+	"github.com/meitu/titan/context"
+	"github.com/meitu/titan/db"
 )
 
 var (

diff --git a/tools/test/main.go b/tools/test/main.go
@@ -4,7 +4,7 @@ import (
 	"flag"
 	"testing"
 
-	"gitlab.meitu.com/platform/titan/tools/autotest"
+	"github.com/meitu/titan/tools/autotest"
 )
 
 func main() {

diff --git a/tools/token/main.go b/tools/token/main.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"time"
 
-	"gitlab.meitu.com/platform/titan/command"
+	"github.com/meitu/titan/command"
 )
 
 var (

diff --git a/util.go b/util.go
@@ -5,7 +5,7 @@ import (
 	"sync/atomic"
 
 	"github.com/twinj/uuid"
-	"gitlab.meitu.com/platform/titan/context"
+	"github.com/meitu/titan/context"
 
 	"go.uber.org/zap"
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ import ( @@
     	"strconv"
     	"time"
-    	"gitlab.meitu.com/platform/titan/db"
+    	"github.com/meitu/titan/db"
     )
     var (
@@ Expand Down @@