Skip to content
This repository was archived by the owner on Jan 28, 2021. It is now read-only.

Commit c6a9c45

Browse files
authored
Replace fork go-vitess by original vitess. (#745)
Replace fork go-vitess by original vitess.
2 parents 4a301c6 + eb2a7ad commit c6a9c45

File tree

22 files changed

+59
-334
lines changed

22 files changed

+59
-334
lines changed

_scripts/go-vitess/LICENSE

Lines changed: 0 additions & 201 deletions
This file was deleted.

_scripts/go-vitess/Makefile

Lines changed: 0 additions & 42 deletions
This file was deleted.

_scripts/go-vitess/README.md

Lines changed: 0 additions & 22 deletions
This file was deleted.

_scripts/go-vitess/doc.go

Lines changed: 0 additions & 9 deletions
This file was deleted.

auth/audit.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"time"
66

77
"github.com/src-d/go-mysql-server/sql"
8-
"gopkg.in/src-d/go-vitess.v1/mysql"
8+
"vitess.io/vitess/go/mysql"
99

1010
"github.com/sirupsen/logrus"
1111
)

auth/auth.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55

66
"gopkg.in/src-d/go-errors.v1"
77
"github.com/src-d/go-mysql-server/sql"
8-
"gopkg.in/src-d/go-vitess.v1/mysql"
8+
"vitess.io/vitess/go/mysql"
99
)
1010

1111
// Permission holds permissions required by a query or grated to a user.

auth/native.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/src-d/go-mysql-server/sql"
1313

1414
"gopkg.in/src-d/go-errors.v1"
15-
"gopkg.in/src-d/go-vitess.v1/mysql"
15+
"vitess.io/vitess/go/mysql"
1616
)
1717

1818
var (

auth/none.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package auth
33
import (
44
"github.com/src-d/go-mysql-server/sql"
55

6-
"gopkg.in/src-d/go-vitess.v1/mysql"
6+
"vitess.io/vitess/go/mysql"
77
)
88

99
// None is an Auth method that always succeeds.

go.mod

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ require (
55
github.com/go-ole/go-ole v1.2.4 // indirect
66
github.com/go-sql-driver/mysql v1.4.1
77
github.com/gogo/protobuf v1.2.1 // indirect
8+
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
89
github.com/golang/protobuf v1.3.0 // indirect
910
github.com/gorilla/handlers v1.4.0 // indirect
1011
github.com/mitchellh/hashstructure v1.0.0
@@ -22,6 +23,6 @@ require (
2223
golang.org/x/net v0.0.0-20190227022144-312bce6e941f // indirect
2324
google.golang.org/grpc v1.19.0 // indirect
2425
gopkg.in/src-d/go-errors.v1 v1.0.0
25-
gopkg.in/src-d/go-vitess.v1 v1.8.0
2626
gopkg.in/yaml.v2 v2.2.2
27+
vitess.io/vitess v3.0.0-rc.3.0.20190602171040-12bfde34629c+incompatible
2728
)

go.sum

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG
3232
github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
3333
github.com/gogo/protobuf v1.2.1 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE=
3434
github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
35+
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
3536
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
3637
github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
3738
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -146,6 +147,7 @@ golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5 h1:x6r4Jo0KNzOOzYd8lbcRsqjuq
146147
golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
147148
golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a h1:1n5lsVfiQW3yfsRGu98756EH1YthsFqr/5mxHduZW2A=
148149
golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
150+
golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
149151
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
150152
golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
151153
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -160,12 +162,12 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+
160162
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
161163
gopkg.in/src-d/go-errors.v1 v1.0.0 h1:cooGdZnCjYbeS1zb1s6pVAAimTdKceRrpn7aKOnNIfc=
162164
gopkg.in/src-d/go-errors.v1 v1.0.0/go.mod h1:q1cBlomlw2FnDBDNGlnh6X0jPihy+QxZfMMNxPCbdYg=
163-
gopkg.in/src-d/go-vitess.v1 v1.8.0 h1:6SA2IpcfrYM96SKnqzEVQuQMitA1kAX4VyFbyH7wmug=
164-
gopkg.in/src-d/go-vitess.v1 v1.8.0/go.mod h1:+g/wDtovsUgE2ioi32fo5Vavrtvfd/N1AvnknTmTvZE=
165165
gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
166166
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
167167
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
168168
modernc.org/mathutil v1.0.0 h1:93vKjrJopTPrtTNpZ8XIovER7iCIH1QU7wNbOQXC60I=
169169
modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k=
170170
modernc.org/strutil v1.0.0 h1:XVFtQwFVwc02Wk+0L/Z/zDDXO81r5Lhe6iMKmGX3KhE=
171171
modernc.org/strutil v1.0.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs=
172+
vitess.io/vitess v3.0.0-rc.3.0.20190602171040-12bfde34629c+incompatible h1:GWnLrAdetgJM0Co5bwwczO49iFZBSInpyGAT77BP9Y0=
173+
vitess.io/vitess v3.0.0-rc.3.0.20190602171040-12bfde34629c+incompatible/go.mod h1:h4qvkyNYTOC0xI+vcidSWoka0gQAZc9ZPHbkHo48gP0=

0 commit comments

Comments
 (0)