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

Commit 0966c4b

Browse files
ajnavarroajnavarro
authored
replace all gopkg.in imports and use only go mods (#736)
replace all gopkg.in imports and use only go mods
2 parents 90e558b + 55d4d61 commit 0966c4b

File tree

271 files changed

+549
-551
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

271 files changed

+549
-551
lines changed

‎.travis.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
language: go
2-
go_import_path: gopkg.in/src-d/go-mysql-server.v0
2+
go_import_path: github.com/src-d/go-mysql-server
33

44
env:
55
global:
66
- LD_LIBRARY_PATH="/usr/local/lib":${LD_LIBRARY_PATH}
7+
- GO111MODULE=on
78

89
addons:
910
apt:
@@ -20,8 +21,7 @@ services:
2021
- docker
2122

2223
install:
23-
- GO111MODULE=on go get ./...
24-
- GO111MODULE=on go mod vendor
24+
- go get ./...
2525
- make dependencies
2626

2727
before_script:
@@ -45,7 +45,7 @@ jobs:
4545
before_install:
4646
- eval "$(gimme 1.12.4)"
4747
install:
48-
- GO111MODULE=on go get ./...
48+
- go get ./...
4949
script:
5050
- make TEST=python-pymysql integration
5151

@@ -54,7 +54,7 @@ jobs:
5454
before_install:
5555
- eval "$(gimme 1.12.4)"
5656
install:
57-
- GO111MODULE=on go get ./...
57+
- go get ./...
5858
script:
5959
- make TEST=php integration
6060

@@ -63,7 +63,7 @@ jobs:
6363
before_install:
6464
- eval "$(gimme 1.12.4)"
6565
install:
66-
- GO111MODULE=on go get ./...
66+
- go get ./...
6767
script:
6868
- make TEST=ruby integration
6969

@@ -72,7 +72,7 @@ jobs:
7272
before_install:
7373
- eval "$(gimme 1.12.4)"
7474
install:
75-
- GO111MODULE=on go get ./...
75+
- go get ./...
7676
script:
7777
- make TEST=jdbc-mariadb integration
7878

@@ -81,7 +81,7 @@ jobs:
8181
before_install:
8282
- eval "$(gimme 1.12.4)"
8383
install:
84-
- GO111MODULE=on go get ./...
84+
- go get ./...
8585
script:
8686
- make TEST=javascript integration
8787

@@ -91,7 +91,7 @@ jobs:
9191
before_install:
9292
- eval "$(gimme 1.12.4)"
9393
install:
94-
- GO111MODULE=on go get ./...
94+
- go get ./...
9595
script:
9696
- make TEST=dotnet integration
9797

@@ -100,6 +100,6 @@ jobs:
100100
before_install:
101101
- eval "$(gimme 1.12.4)"
102102
install:
103-
- GO111MODULE=on go get ./...
103+
- go get ./...
104104
script:
105105
- make TEST=c integration

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ Having data in another format that you want as tabular data to query using SQL,
3333

3434
## Installation
3535

36-
The import path for the package is `gopkg.in/src-d/go-mysql-server.v0`.
36+
The import path for the package is `github.com/src-d/go-mysql-server`.
3737

3838
To install it, run:
3939

4040
```
41-
go get gopkg.in/src-d/go-mysql-server.v0
41+
go get github.com/src-d/go-mysql-server
4242
```
4343

4444
## Documentation

‎_example/main.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ package main
33
import (
44
"time"
55

6-
"gopkg.in/src-d/go-mysql-server.v0"
7-
"gopkg.in/src-d/go-mysql-server.v0/auth"
8-
"gopkg.in/src-d/go-mysql-server.v0/mem"
9-
"gopkg.in/src-d/go-mysql-server.v0/server"
10-
"gopkg.in/src-d/go-mysql-server.v0/sql"
6+
"github.com/src-d/go-mysql-server"
7+
"github.com/src-d/go-mysql-server/auth"
8+
"github.com/src-d/go-mysql-server/mem"
9+
"github.com/src-d/go-mysql-server/server"
10+
"github.com/src-d/go-mysql-server/sql"
1111
)
1212

1313
// Example of how to implement a MySQL server based on a Engine:

‎_integration/go/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module gopkg.in/src-d/go-mysql-server.v0/integration/go
1+
module github.com/src-d/go-mysql-server/integration/go
22

33
require (
44
github.com/go-sql-driver/mysql v1.4.0

‎auth/audit.go

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

7-
"gopkg.in/src-d/go-mysql-server.v0/sql"
7+
"github.com/src-d/go-mysql-server/sql"
88
"gopkg.in/src-d/go-vitess.v1/mysql"
99

1010
"github.com/sirupsen/logrus"

‎auth/audit_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"testing"
66
"time"
77

8-
"gopkg.in/src-d/go-mysql-server.v0/auth"
9-
"gopkg.in/src-d/go-mysql-server.v0/sql"
8+
"github.com/src-d/go-mysql-server/auth"
9+
"github.com/src-d/go-mysql-server/sql"
1010

1111
"github.com/sanity-io/litter"
1212
"github.com/sirupsen/logrus"

‎auth/auth.go

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

66
"gopkg.in/src-d/go-errors.v1"
7-
"gopkg.in/src-d/go-mysql-server.v0/sql"
7+
"github.com/src-d/go-mysql-server/sql"
88
"gopkg.in/src-d/go-vitess.v1/mysql"
99
)
1010

‎auth/common_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ import (
99
"testing"
1010

1111
"github.com/stretchr/testify/require"
12-
sqle "gopkg.in/src-d/go-mysql-server.v0"
13-
"gopkg.in/src-d/go-mysql-server.v0/auth"
14-
"gopkg.in/src-d/go-mysql-server.v0/mem"
15-
"gopkg.in/src-d/go-mysql-server.v0/server"
16-
"gopkg.in/src-d/go-mysql-server.v0/sql"
17-
"gopkg.in/src-d/go-mysql-server.v0/sql/analyzer"
18-
"gopkg.in/src-d/go-mysql-server.v0/sql/index/pilosa"
12+
sqle "github.com/src-d/go-mysql-server"
13+
"github.com/src-d/go-mysql-server/auth"
14+
"github.com/src-d/go-mysql-server/mem"
15+
"github.com/src-d/go-mysql-server/server"
16+
"github.com/src-d/go-mysql-server/sql"
17+
"github.com/src-d/go-mysql-server/sql/analyzer"
18+
"github.com/src-d/go-mysql-server/sql/index/pilosa"
1919
)
2020

2121
const port = 3336

‎auth/native.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"regexp"
1010
"strings"
1111

12-
"gopkg.in/src-d/go-mysql-server.v0/sql"
12+
"github.com/src-d/go-mysql-server/sql"
1313

1414
"gopkg.in/src-d/go-errors.v1"
1515
"gopkg.in/src-d/go-vitess.v1/mysql"

‎auth/native_test.go

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

8-
"gopkg.in/src-d/go-mysql-server.v0/auth"
8+
"github.com/src-d/go-mysql-server/auth"
99

1010
_ "github.com/go-sql-driver/mysql"
1111
"github.com/stretchr/testify/require"

‎auth/none.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package auth
22

33
import (
4-
"gopkg.in/src-d/go-mysql-server.v0/sql"
4+
"github.com/src-d/go-mysql-server/sql"
55

66
"gopkg.in/src-d/go-vitess.v1/mysql"
77
)

‎auth/none_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package auth_test
33
import (
44
"testing"
55

6-
"gopkg.in/src-d/go-mysql-server.v0/auth"
6+
"github.com/src-d/go-mysql-server/auth"
77
)
88

99
func TestNoneAuthentication(t *testing.T) {

‎benchmark/metadata.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package benchmark
22

3-
import "gopkg.in/src-d/go-mysql-server.v0/sql"
3+
import "github.com/src-d/go-mysql-server/sql"
44

55
type tableMetadata struct {
66
schema sql.Schema

‎benchmark/tpc_h_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ import (
1010
"path/filepath"
1111
"testing"
1212

13-
"gopkg.in/src-d/go-mysql-server.v0"
13+
"github.com/src-d/go-mysql-server"
1414

15-
"gopkg.in/src-d/go-mysql-server.v0/mem"
16-
"gopkg.in/src-d/go-mysql-server.v0/sql"
15+
"github.com/src-d/go-mysql-server/mem"
16+
"github.com/src-d/go-mysql-server/sql"
1717
)
1818

1919
var scriptsPath = "../_scripts/tpc-h/"

‎engine.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
package sqle // import "gopkg.in/src-d/go-mysql-server.v0"
1+
package sqle // import "github.com/src-d/go-mysql-server"
22

33
import (
44
opentracing "github.com/opentracing/opentracing-go"
55
"github.com/sirupsen/logrus"
6-
"gopkg.in/src-d/go-mysql-server.v0/auth"
7-
"gopkg.in/src-d/go-mysql-server.v0/sql"
8-
"gopkg.in/src-d/go-mysql-server.v0/sql/analyzer"
9-
"gopkg.in/src-d/go-mysql-server.v0/sql/expression/function"
10-
"gopkg.in/src-d/go-mysql-server.v0/sql/parse"
11-
"gopkg.in/src-d/go-mysql-server.v0/sql/plan"
6+
"github.com/src-d/go-mysql-server/auth"
7+
"github.com/src-d/go-mysql-server/sql"
8+
"github.com/src-d/go-mysql-server/sql/analyzer"
9+
"github.com/src-d/go-mysql-server/sql/expression/function"
10+
"github.com/src-d/go-mysql-server/sql/parse"
11+
"github.com/src-d/go-mysql-server/sql/plan"
1212
)
1313

1414
// Config for the Engine.

‎engine_test.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ import (
1111
"testing"
1212
"time"
1313

14-
sqle "gopkg.in/src-d/go-mysql-server.v0"
15-
"gopkg.in/src-d/go-mysql-server.v0/auth"
16-
"gopkg.in/src-d/go-mysql-server.v0/mem"
17-
"gopkg.in/src-d/go-mysql-server.v0/sql"
18-
"gopkg.in/src-d/go-mysql-server.v0/sql/analyzer"
19-
"gopkg.in/src-d/go-mysql-server.v0/sql/index/pilosa"
20-
"gopkg.in/src-d/go-mysql-server.v0/sql/parse"
21-
"gopkg.in/src-d/go-mysql-server.v0/sql/plan"
22-
"gopkg.in/src-d/go-mysql-server.v0/test"
14+
sqle "github.com/src-d/go-mysql-server"
15+
"github.com/src-d/go-mysql-server/auth"
16+
"github.com/src-d/go-mysql-server/mem"
17+
"github.com/src-d/go-mysql-server/sql"
18+
"github.com/src-d/go-mysql-server/sql/analyzer"
19+
"github.com/src-d/go-mysql-server/sql/index/pilosa"
20+
"github.com/src-d/go-mysql-server/sql/parse"
21+
"github.com/src-d/go-mysql-server/sql/plan"
22+
"github.com/src-d/go-mysql-server/test"
2323

2424
"github.com/stretchr/testify/require"
2525
)

‎example_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import (
44
"fmt"
55
"io"
66

7-
"gopkg.in/src-d/go-mysql-server.v0"
8-
"gopkg.in/src-d/go-mysql-server.v0/mem"
9-
"gopkg.in/src-d/go-mysql-server.v0/sql"
7+
"github.com/src-d/go-mysql-server"
8+
"github.com/src-d/go-mysql-server/mem"
9+
"github.com/src-d/go-mysql-server/sql"
1010
)
1111

1212
func Example() {

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module gopkg.in/src-d/go-mysql-server.v0
1+
module github.com/src-d/go-mysql-server
22

33
require (
44
github.com/StackExchange/wmi v0.0.0-20181212234831-e0a55b97c705 // indirect

‎go.sum

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,6 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+
160160
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
161161
gopkg.in/src-d/go-errors.v1 v1.0.0 h1:cooGdZnCjYbeS1zb1s6pVAAimTdKceRrpn7aKOnNIfc=
162162
gopkg.in/src-d/go-errors.v1 v1.0.0/go.mod h1:q1cBlomlw2FnDBDNGlnh6X0jPihy+QxZfMMNxPCbdYg=
163-
gopkg.in/src-d/go-vitess.v1 v1.6.0 h1:jIe2MXLIewejW6sebf7IPnSzwt4fPQIj53nPuzg/xD8=
164-
gopkg.in/src-d/go-vitess.v1 v1.6.0/go.mod h1:+g/wDtovsUgE2ioi32fo5Vavrtvfd/N1AvnknTmTvZE=
165163
gopkg.in/src-d/go-vitess.v1 v1.7.0 h1:7hYhf5sesJDLxl8//V/q6IyQJ4mOktLmkkfosMM9d00=
166164
gopkg.in/src-d/go-vitess.v1 v1.7.0/go.mod h1:+g/wDtovsUgE2ioi32fo5Vavrtvfd/N1AvnknTmTvZE=
167165
gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=

‎mem/database.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package mem // import "gopkg.in/src-d/go-mysql-server.v0/mem"
1+
package mem // import "github.com/src-d/go-mysql-server/mem"
22

33
import (
4-
"gopkg.in/src-d/go-mysql-server.v0/sql"
4+
"github.com/src-d/go-mysql-server/sql"
55
)
66

77
// Database is an in-memory database.

‎mem/database_test.go

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

66
"github.com/stretchr/testify/require"
7-
"gopkg.in/src-d/go-mysql-server.v0/sql"
7+
"github.com/src-d/go-mysql-server/sql"
88
)
99

1010
func TestDatabase_Name(t *testing.T) {

‎mem/table.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"strconv"
99

1010
errors "gopkg.in/src-d/go-errors.v1"
11-
"gopkg.in/src-d/go-mysql-server.v0/sql"
12-
"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
11+
"github.com/src-d/go-mysql-server/sql"
12+
"github.com/src-d/go-mysql-server/sql/expression"
1313
)
1414

1515
// Table represents an in-memory database table.

‎mem/table_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"testing"
77

88
"github.com/stretchr/testify/require"
9-
"gopkg.in/src-d/go-mysql-server.v0/sql"
10-
"gopkg.in/src-d/go-mysql-server.v0/sql/expression"
9+
"github.com/src-d/go-mysql-server/sql"
10+
"github.com/src-d/go-mysql-server/sql/expression"
1111
)
1212

1313
func TestTablePartitionsCount(t *testing.T) {

‎server/context.go

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

77
opentracing "github.com/opentracing/opentracing-go"
8-
"gopkg.in/src-d/go-mysql-server.v0/sql"
8+
"github.com/src-d/go-mysql-server/sql"
99
"gopkg.in/src-d/go-vitess.v1/mysql"
1010
)
1111

‎server/handler.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99
"time"
1010

1111
errors "gopkg.in/src-d/go-errors.v1"
12-
sqle "gopkg.in/src-d/go-mysql-server.v0"
13-
"gopkg.in/src-d/go-mysql-server.v0/auth"
14-
"gopkg.in/src-d/go-mysql-server.v0/sql"
12+
sqle "github.com/src-d/go-mysql-server"
13+
"github.com/src-d/go-mysql-server/auth"
14+
"github.com/src-d/go-mysql-server/sql"
1515

1616
"github.com/sirupsen/logrus"
1717
"gopkg.in/src-d/go-vitess.v1/mysql"

‎server/handler_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import (
77
"testing"
88
"unsafe"
99

10-
sqle "gopkg.in/src-d/go-mysql-server.v0"
11-
"gopkg.in/src-d/go-mysql-server.v0/mem"
12-
"gopkg.in/src-d/go-mysql-server.v0/sql"
10+
sqle "github.com/src-d/go-mysql-server"
11+
"github.com/src-d/go-mysql-server/mem"
12+
"github.com/src-d/go-mysql-server/sql"
1313
"gopkg.in/src-d/go-vitess.v1/mysql"
1414
"gopkg.in/src-d/go-vitess.v1/sqltypes"
1515
"gopkg.in/src-d/go-vitess.v1/vt/proto/query"

‎server/server.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package server // import "gopkg.in/src-d/go-mysql-server.v0/server"
1+
package server // import "github.com/src-d/go-mysql-server/server"
22

33
import (
44
"time"
55

66
opentracing "github.com/opentracing/opentracing-go"
7-
"gopkg.in/src-d/go-mysql-server.v0"
8-
"gopkg.in/src-d/go-mysql-server.v0/auth"
7+
"github.com/src-d/go-mysql-server"
8+
"github.com/src-d/go-mysql-server/auth"
99

1010
"gopkg.in/src-d/go-vitess.v1/mysql"
1111
)

0 commit comments

Comments
 (0)