diff --git a/.github/workflows/bump-brew-formula.yml b/.github/workflows/bump-brew-formula.yml index b57972322e..afc927b3b7 100644 --- a/.github/workflows/bump-brew-formula.yml +++ b/.github/workflows/bump-brew-formula.yml @@ -16,7 +16,7 @@ jobs: formula-name: dolt homebrew-tap: Homebrew/homebrew-core base-branch: release - download-url: ${{format('https://github.com/liquidata-inc/dolt/archive/v{0}.tar.gz', steps.get_version.outputs.VERSION)}} + download-url: ${{format('https://github.com/dolthub/dolt/archive/v{0}.tar.gz', steps.get_version.outputs.VERSION)}} commit-message: ${{format('dolt {0}', steps.get_version.outputs.VERSION)}} env: COMMITTER_TOKEN: ${{secrets.HOMEBREW_GITHUB_TOKEN}} diff --git a/README.md b/README.md index caaac35234..afa0f03da3 100644 --- a/README.md +++ b/README.md @@ -51,11 +51,11 @@ These installation instructions assume that you have Go installed, and that `go` To install on Linux or Mac based systems run: -```sudo bash -c 'curl -L https://github.com/liquidata-inc/dolt/releases/latest/download/install.sh | bash'``` +```sudo bash -c 'curl -L https://github.com/dolthub/dolt/releases/latest/download/install.sh | bash'``` This will download the latest ```dolt``` release and put it in ```/usr/local/bin/```, which is probably on your ```PATH```. -For Windows, locate the latest Microsoft Installer (`.msi` file) in [releases](https://github.com/liquidata-inc/dolt/releases), and run it. This will install the latest dolt. +For Windows, locate the latest Microsoft Installer (`.msi` file) in [releases](https://github.com/dolthub/dolt/releases), and run it. This will install the latest dolt. ### From Source @@ -313,5 +313,5 @@ If you want to discuss the project in a more open ended manner, join us on [Disc Dolt relies heavily on open source code and ideas from the [Noms](https://github.com/attic-labs/noms) project. We are very thankful to the Noms team for making this code freely available, without which we would not have been able to build Dolt so rapidly. Dolt is licensed under the Apache License, Version 2.0. See -[LICENSE](https://github.com/liquidata-inc/dolt/blob/master/LICENSE) for +[LICENSE](https://github.com/dolthub/dolt/blob/master/LICENSE) for details. diff --git a/bats/back-compat.bats b/bats/back-compat.bats index 51d7236ff8..a8de6628f2 100644 --- a/bats/back-compat.bats +++ b/bats/back-compat.bats @@ -122,7 +122,7 @@ teardown() { } @test "back-compat: resolving conflicts" { - skip https://github.com/liquidata-inc/dolt/issues/773 + skip https://github.com/dolthub/dolt/issues/773 for testdir in */; do cd "$testdir" run dolt migrate diff --git a/bats/compatibility/corona-virus-test.sh b/bats/compatibility/corona-virus-test.sh index b42aa07d34..319d27842a 100755 --- a/bats/compatibility/corona-virus-test.sh +++ b/bats/compatibility/corona-virus-test.sh @@ -9,7 +9,7 @@ function download_release() { basename=dolt-"$PLATFORM_TUPLE" filename="$basename".tar.gz filepath=binaries/"$ver"/"$filename" - url="https://github.com/liquidata-inc/dolt/releases/download/$ver/$filename" + url="https://github.com/dolthub/dolt/releases/download/$ver/$filename" curl -L -o "$filepath" "$url" cd "$dirname" && tar zxf "$filename" echo "$dirname"/"$basename"/bin diff --git a/bats/compatibility/migration_test_files/migrate-push-pull.sh b/bats/compatibility/migration_test_files/migrate-push-pull.sh index 98e54c6fd4..1e5424f47c 100755 --- a/bats/compatibility/migration_test_files/migrate-push-pull.sh +++ b/bats/compatibility/migration_test_files/migrate-push-pull.sh @@ -9,7 +9,7 @@ function download_release() { basename=dolt-"$PLATFORM_TUPLE" filename="$basename".tar.gz filepath=binaries/"$ver"/"$filename" - url="https://github.com/liquidata-inc/dolt/releases/download/$ver/$filename" + url="https://github.com/dolthub/dolt/releases/download/$ver/$filename" curl -L -o "$filepath" "$url" cd "$dirname" && tar zxf "$filename" echo "$dirname"/"$basename"/bin diff --git a/bats/compatibility/runner.sh b/bats/compatibility/runner.sh index 620e248897..603e94f75c 100755 --- a/bats/compatibility/runner.sh +++ b/bats/compatibility/runner.sh @@ -9,7 +9,7 @@ function download_release() { basename=dolt-"$PLATFORM_TUPLE" filename="$basename".tar.gz filepath=binaries/"$ver"/"$filename" - url="https://github.com/liquidata-inc/dolt/releases/download/$ver/$filename" + url="https://github.com/dolthub/dolt/releases/download/$ver/$filename" curl -L -o "$filepath" "$url" cd "$dirname" && tar zxf "$filename" echo "$dirname"/"$basename"/bin diff --git a/bats/conflict-detection.bats b/bats/conflict-detection.bats index c5496106e3..607bc6387c 100644 --- a/bats/conflict-detection.bats +++ b/bats/conflict-detection.bats @@ -291,7 +291,7 @@ SQL } @test "two branches add different column. merge. no conflict" { - skip https://github.com/liquidata-inc/dolt/issues/773 + skip https://github.com/dolthub/dolt/issues/773 dolt sql < ./gen/proto/dolt/services/eventsapi +replace github.com/dolthub/dolt/go/gen/proto/dolt/services/eventsapi => ./gen/proto/dolt/services/eventsapi go 1.13 diff --git a/go/go.sum b/go/go.sum index b9fe89cb70..da056b9593 100644 --- a/go/go.sum +++ b/go/go.sum @@ -150,6 +150,18 @@ github.com/denisbrodbeck/machineid v1.0.1 h1:geKr9qtkB876mXguW2X6TU4ZynleN6ezuMS github.com/denisbrodbeck/machineid v1.0.1/go.mod h1:dJUwb7PTidGDeYyUBmXZ2GphQBbjJCrnectwCyxcUSI= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= +github.com/dolthub/go-mysql-server v0.6.1-0.20200925111808-f2e3f664a4a6 h1:IrbHhymz9fJzv7WINQ+KInkrXq+KvBgacmy606iuKn0= +github.com/dolthub/go-mysql-server v0.6.1-0.20200925111808-f2e3f664a4a6/go.mod h1:lVjGA00yIbh3eYYVkk8nug51k3tDJgrP1dzdND4LbNE= +github.com/dolthub/go-mysql-server v0.6.1-0.20200925124913-c9a9f6a33760 h1:O0RZUBcrwX+UFuSNwTGj8PJ5EelhlLGb4UT96zwbQWU= +github.com/dolthub/go-mysql-server v0.6.1-0.20200925124913-c9a9f6a33760/go.mod h1:lVjGA00yIbh3eYYVkk8nug51k3tDJgrP1dzdND4LbNE= +github.com/dolthub/go-mysql-server v0.6.1-0.20200925175850-8c7ee5bc3433 h1:YuEbUnI7s/myuijv2P4kapE5LZjnQgCb4OremiltT1M= +github.com/dolthub/go-mysql-server v0.6.1-0.20200925175850-8c7ee5bc3433/go.mod h1:l6m7hM8ttCxNKSYchwc/QzuYmfC8s6Fk06Azqf3OgZE= +github.com/dolthub/go-mysql-server v0.6.1-0.20200925223107-d90191d39435 h1:ycWR7ucTyyAJW65db+7FDWWhUbTQL6PBvLjGWv17980= +github.com/dolthub/go-mysql-server v0.6.1-0.20200925223107-d90191d39435/go.mod h1:l6m7hM8ttCxNKSYchwc/QzuYmfC8s6Fk06Azqf3OgZE= +github.com/dolthub/vitess v0.0.0-20200925110704-d86b438c5010 h1:E1ACd1EgHljV0Dgxfqp53PfdwXBMQUF0cGn964ZCYHA= +github.com/dolthub/vitess v0.0.0-20200925110704-d86b438c5010/go.mod h1:hUE8oSk2H5JZnvtlLBhJPYC8WZCA5AoSntdLTcBvdBM= +github.com/dolthub/vitess v0.0.0-20200925174744-823c7e177c3f h1:37HLaUKuZMDOxKT8Lxq7Z1IZLiwTp6UKaDR7xC5aihM= +github.com/dolthub/vitess v0.0.0-20200925174744-823c7e177c3f/go.mod h1:hUE8oSk2H5JZnvtlLBhJPYC8WZCA5AoSntdLTcBvdBM= github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= @@ -432,6 +444,8 @@ github.com/liquidata-inc/go-mysql-server v0.6.1-0.20200921093816-a2f606c0d13d h1 github.com/liquidata-inc/go-mysql-server v0.6.1-0.20200921093816-a2f606c0d13d/go.mod h1:T6gBgEkMsA2WUGPD/J25wuVyX+4Gd2k9mPBta9YDoxY= github.com/liquidata-inc/ishell v0.0.0-20190514193646-693241f1f2a0 h1:phMgajKClMUiIr+hF2LGt8KRuUa2Vd2GI1sNgHgSXoU= github.com/liquidata-inc/ishell v0.0.0-20190514193646-693241f1f2a0/go.mod h1:YC1rI9k5gx8D02ljlbxDfZe80s/iq8bGvaaQsvR+qxs= +github.com/liquidata-inc/ishell v2.0.0+incompatible h1:3Dc4sgtapmDrlPJA3SWGXU87i1SdJP3Kd0jfdO2veh8= +github.com/liquidata-inc/ishell v2.0.0+incompatible/go.mod h1:de/70OOFF0+tsqKiY3PD1dPVAkafTmgDsjNy7EiuAjU= github.com/liquidata-inc/mmap-go v1.0.3 h1:2LndAeAtup9rpvUmu4wZSYCsjCQ0Zpc+NqE+6+PnT7g= github.com/liquidata-inc/mmap-go v1.0.3/go.mod h1:w0doE7jfkuDEZyxb/zD3VWnRaQBYx1uDTS816kH8HoY= github.com/liquidata-inc/sqllogictest/go v0.0.0-20200320151923-b11801f10e15 h1:H3RwcYfzkdW4kFh7znTUopcX3XZqnFXm6pcmxSy0mNo= diff --git a/go/libraries/doltcore/creds/creds.go b/go/libraries/doltcore/creds/creds.go index a201cf423c..401838a9e8 100644 --- a/go/libraries/doltcore/creds/creds.go +++ b/go/libraries/doltcore/creds/creds.go @@ -25,8 +25,8 @@ import ( "gopkg.in/square/go-jose.v2" "gopkg.in/square/go-jose.v2/jwt" - "github.com/liquidata-inc/dolt/go/libraries/utils/set" - "github.com/liquidata-inc/dolt/go/store/util/datetime" + "github.com/dolthub/dolt/go/libraries/utils/set" + "github.com/dolthub/dolt/go/store/util/datetime" ) const ( diff --git a/go/libraries/doltcore/creds/jwk.go b/go/libraries/doltcore/creds/jwk.go index cf02c7a1bf..77325cf267 100644 --- a/go/libraries/doltcore/creds/jwk.go +++ b/go/libraries/doltcore/creds/jwk.go @@ -21,8 +21,8 @@ import ( "io/ioutil" "path/filepath" - "github.com/liquidata-inc/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/dolt/go/libraries/utils/iohelp" + "github.com/dolthub/dolt/go/libraries/utils/filesys" + "github.com/dolthub/dolt/go/libraries/utils/iohelp" ) const ( diff --git a/go/libraries/doltcore/creds/jwk_test.go b/go/libraries/doltcore/creds/jwk_test.go index 43117ea396..f2ccbb8899 100644 --- a/go/libraries/doltcore/creds/jwk_test.go +++ b/go/libraries/doltcore/creds/jwk_test.go @@ -19,7 +19,7 @@ import ( "path/filepath" "testing" - "github.com/liquidata-inc/dolt/go/libraries/utils/filesys" + "github.com/dolthub/dolt/go/libraries/utils/filesys" ) func TestSerializeAndDeserialize(t *testing.T) { diff --git a/go/libraries/doltcore/dbfactory/aws.go b/go/libraries/doltcore/dbfactory/aws.go index 9d438ac020..332c36b781 100644 --- a/go/libraries/doltcore/dbfactory/aws.go +++ b/go/libraries/doltcore/dbfactory/aws.go @@ -27,10 +27,10 @@ import ( "github.com/aws/aws-sdk-go/service/dynamodb" "github.com/aws/aws-sdk-go/service/s3" - "github.com/liquidata-inc/dolt/go/store/chunks" - "github.com/liquidata-inc/dolt/go/store/datas" - "github.com/liquidata-inc/dolt/go/store/nbs" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/datas" + "github.com/dolthub/dolt/go/store/nbs" + "github.com/dolthub/dolt/go/store/types" ) const ( diff --git a/go/libraries/doltcore/dbfactory/factory.go b/go/libraries/doltcore/dbfactory/factory.go index 5817efa775..1e3f29575e 100644 --- a/go/libraries/doltcore/dbfactory/factory.go +++ b/go/libraries/doltcore/dbfactory/factory.go @@ -20,9 +20,9 @@ import ( "net/url" "strings" - "github.com/liquidata-inc/dolt/go/libraries/utils/earl" - "github.com/liquidata-inc/dolt/go/store/datas" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/utils/earl" + "github.com/dolthub/dolt/go/store/datas" + "github.com/dolthub/dolt/go/store/types" ) const ( diff --git a/go/libraries/doltcore/dbfactory/factory_test.go b/go/libraries/doltcore/dbfactory/factory_test.go index f92f8df531..0d508d1f11 100644 --- a/go/libraries/doltcore/dbfactory/factory_test.go +++ b/go/libraries/doltcore/dbfactory/factory_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) /* diff --git a/go/libraries/doltcore/dbfactory/file.go b/go/libraries/doltcore/dbfactory/file.go index b8b677158f..2403300dfb 100644 --- a/go/libraries/doltcore/dbfactory/file.go +++ b/go/libraries/doltcore/dbfactory/file.go @@ -20,10 +20,10 @@ import ( "os" "path/filepath" - "github.com/liquidata-inc/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/dolt/go/store/datas" - "github.com/liquidata-inc/dolt/go/store/nbs" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/utils/filesys" + "github.com/dolthub/dolt/go/store/datas" + "github.com/dolthub/dolt/go/store/nbs" + "github.com/dolthub/dolt/go/store/types" ) const ( diff --git a/go/libraries/doltcore/dbfactory/grpc.go b/go/libraries/doltcore/dbfactory/grpc.go index c95df607c6..02df03f344 100644 --- a/go/libraries/doltcore/dbfactory/grpc.go +++ b/go/libraries/doltcore/dbfactory/grpc.go @@ -21,13 +21,13 @@ import ( "google.golang.org/grpc" - remotesapi "github.com/liquidata-inc/dolt/go/gen/proto/dolt/services/remotesapi/v1alpha1" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/grpcendpoint" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/remotestorage" - "github.com/liquidata-inc/dolt/go/libraries/events" - "github.com/liquidata-inc/dolt/go/store/chunks" - "github.com/liquidata-inc/dolt/go/store/datas" - "github.com/liquidata-inc/dolt/go/store/types" + remotesapi "github.com/dolthub/dolt/go/gen/proto/dolt/services/remotesapi/v1alpha1" + "github.com/dolthub/dolt/go/libraries/doltcore/grpcendpoint" + "github.com/dolthub/dolt/go/libraries/doltcore/remotestorage" + "github.com/dolthub/dolt/go/libraries/events" + "github.com/dolthub/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/datas" + "github.com/dolthub/dolt/go/store/types" ) // GRPCDialProvider is an interface for getting a *grpc.ClientConn. diff --git a/go/libraries/doltcore/dbfactory/gs.go b/go/libraries/doltcore/dbfactory/gs.go index de1232db5c..ceb9960ac5 100644 --- a/go/libraries/doltcore/dbfactory/gs.go +++ b/go/libraries/doltcore/dbfactory/gs.go @@ -20,9 +20,9 @@ import ( "cloud.google.com/go/storage" - "github.com/liquidata-inc/dolt/go/store/datas" - "github.com/liquidata-inc/dolt/go/store/nbs" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/datas" + "github.com/dolthub/dolt/go/store/nbs" + "github.com/dolthub/dolt/go/store/types" ) // GSFactory is a DBFactory implementation for creating GCS backed databases diff --git a/go/libraries/doltcore/dbfactory/mem.go b/go/libraries/doltcore/dbfactory/mem.go index f735b3b9d7..86418f619e 100644 --- a/go/libraries/doltcore/dbfactory/mem.go +++ b/go/libraries/doltcore/dbfactory/mem.go @@ -18,9 +18,9 @@ import ( "context" "net/url" - "github.com/liquidata-inc/dolt/go/store/chunks" - "github.com/liquidata-inc/dolt/go/store/datas" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/datas" + "github.com/dolthub/dolt/go/store/types" ) // MemFactory is a DBFactory implementation for creating in memory backed databases diff --git a/go/libraries/doltcore/diff/async_differ.go b/go/libraries/doltcore/diff/async_differ.go index 8279c32409..151f20077d 100644 --- a/go/libraries/doltcore/diff/async_differ.go +++ b/go/libraries/doltcore/diff/async_differ.go @@ -19,10 +19,10 @@ import ( "errors" "time" - "github.com/liquidata-inc/dolt/go/store/atomicerr" + "github.com/dolthub/dolt/go/store/atomicerr" - "github.com/liquidata-inc/dolt/go/store/diff" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/diff" + "github.com/dolthub/dolt/go/store/types" ) type AsyncDiffer struct { diff --git a/go/libraries/doltcore/diff/diff_coloring_transform.go b/go/libraries/doltcore/diff/diff_coloring_transform.go index aced1b64c4..839c59ec34 100644 --- a/go/libraries/doltcore/diff/diff_coloring_transform.go +++ b/go/libraries/doltcore/diff/diff_coloring_transform.go @@ -17,8 +17,8 @@ package diff import ( "github.com/fatih/color" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/pipeline" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/table/pipeline" ) var greenTextProp = map[string]interface{}{colorRowProp: color.GreenString} diff --git a/go/libraries/doltcore/diff/diff_sink.go b/go/libraries/doltcore/diff/diff_sink.go index 0841f2b892..f88285a3d1 100644 --- a/go/libraries/doltcore/diff/diff_sink.go +++ b/go/libraries/doltcore/diff/diff_sink.go @@ -21,12 +21,12 @@ import ( "github.com/fatih/color" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/pipeline" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/untyped" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/untyped/tabular" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/table/pipeline" + "github.com/dolthub/dolt/go/libraries/doltcore/table/untyped" + "github.com/dolthub/dolt/go/libraries/doltcore/table/untyped/tabular" + "github.com/dolthub/dolt/go/store/types" ) const ( diff --git a/go/libraries/doltcore/diff/diff_source.go b/go/libraries/doltcore/diff/diff_source.go index 6976222f12..7f8d94d50e 100644 --- a/go/libraries/doltcore/diff/diff_source.go +++ b/go/libraries/doltcore/diff/diff_source.go @@ -19,11 +19,11 @@ import ( "io" "time" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/rowconv" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/pipeline" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/rowconv" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/table/pipeline" + "github.com/dolthub/dolt/go/store/types" ) const ( diff --git a/go/libraries/doltcore/diff/diff_splitter.go b/go/libraries/doltcore/diff/diff_splitter.go index 971c23ac4d..4816d7ac8a 100644 --- a/go/libraries/doltcore/diff/diff_splitter.go +++ b/go/libraries/doltcore/diff/diff_splitter.go @@ -15,11 +15,11 @@ package diff import ( - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/rowconv" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/pipeline" - "github.com/liquidata-inc/dolt/go/libraries/utils/valutil" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/rowconv" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/table/pipeline" + "github.com/dolthub/dolt/go/libraries/utils/valutil" ) const ( diff --git a/go/libraries/doltcore/diff/diff_summary.go b/go/libraries/doltcore/diff/diff_summary.go index 7c05fcf66f..b66609153a 100644 --- a/go/libraries/doltcore/diff/diff_summary.go +++ b/go/libraries/doltcore/diff/diff_summary.go @@ -19,8 +19,8 @@ import ( "errors" "time" - "github.com/liquidata-inc/dolt/go/store/diff" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/diff" + "github.com/dolthub/dolt/go/store/types" ) type DiffSummaryProgress struct { diff --git a/go/libraries/doltcore/diff/diffs.go b/go/libraries/doltcore/diff/diffs.go index 3f879dfdd1..0127bd81ea 100644 --- a/go/libraries/doltcore/diff/diffs.go +++ b/go/libraries/doltcore/diff/diffs.go @@ -18,11 +18,11 @@ import ( "context" "sort" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/store/hash" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/env" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/types" ) type TableDiffType int diff --git a/go/libraries/doltcore/diff/querydiff/analyze.go b/go/libraries/doltcore/diff/querydiff/analyze.go index f51542b46e..da914f5fe2 100644 --- a/go/libraries/doltcore/diff/querydiff/analyze.go +++ b/go/libraries/doltcore/diff/querydiff/analyze.go @@ -17,9 +17,9 @@ package querydiff import ( "fmt" - "github.com/liquidata-inc/go-mysql-server/sql" - "github.com/liquidata-inc/go-mysql-server/sql/expression" - "github.com/liquidata-inc/go-mysql-server/sql/plan" + "github.com/dolthub/go-mysql-server/sql" + "github.com/dolthub/go-mysql-server/sql/expression" + "github.com/dolthub/go-mysql-server/sql/plan" ) // lazyQueryPlan transforms a query plan by removing Project nodes and returning diff --git a/go/libraries/doltcore/diff/querydiff/iter_queue.go b/go/libraries/doltcore/diff/querydiff/iter_queue.go index ca9f17c4c3..b6f20575f5 100644 --- a/go/libraries/doltcore/diff/querydiff/iter_queue.go +++ b/go/libraries/doltcore/diff/querydiff/iter_queue.go @@ -17,10 +17,10 @@ package querydiff import ( "io" - "github.com/liquidata-inc/go-mysql-server/sql" - "github.com/liquidata-inc/go-mysql-server/sql/plan" + "github.com/dolthub/go-mysql-server/sql" + "github.com/dolthub/go-mysql-server/sql/plan" - "github.com/liquidata-inc/dolt/go/store/atomicerr" + "github.com/dolthub/dolt/go/store/atomicerr" ) const ( diff --git a/go/libraries/doltcore/diff/querydiff/query_differ.go b/go/libraries/doltcore/diff/querydiff/query_differ.go index 57a96da05a..74f519f9f9 100644 --- a/go/libraries/doltcore/diff/querydiff/query_differ.go +++ b/go/libraries/doltcore/diff/querydiff/query_differ.go @@ -21,18 +21,18 @@ import ( "math" "strings" - sqle "github.com/liquidata-inc/go-mysql-server" - "github.com/liquidata-inc/go-mysql-server/sql" - "github.com/liquidata-inc/go-mysql-server/sql/expression/function" - "github.com/liquidata-inc/go-mysql-server/sql/information_schema" - "github.com/liquidata-inc/go-mysql-server/sql/parse" - "github.com/liquidata-inc/go-mysql-server/sql/plan" - "github.com/liquidata-inc/vitess/go/vt/sqlparser" + sqle "github.com/dolthub/go-mysql-server" + "github.com/dolthub/go-mysql-server/sql" + "github.com/dolthub/go-mysql-server/sql/expression/function" + "github.com/dolthub/go-mysql-server/sql/information_schema" + "github.com/dolthub/go-mysql-server/sql/parse" + "github.com/dolthub/go-mysql-server/sql/plan" + "github.com/dolthub/vitess/go/vt/sqlparser" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/env" - dsqle "github.com/liquidata-inc/dolt/go/libraries/doltcore/sqle" - "github.com/liquidata-inc/dolt/go/store/atomicerr" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/env" + dsqle "github.com/dolthub/dolt/go/libraries/doltcore/sqle" + "github.com/dolthub/dolt/go/store/atomicerr" ) const ( diff --git a/go/libraries/doltcore/diff/querydiff/query_differ_test.go b/go/libraries/doltcore/diff/querydiff/query_differ_test.go index 8583318049..70f69817bb 100644 --- a/go/libraries/doltcore/diff/querydiff/query_differ_test.go +++ b/go/libraries/doltcore/diff/querydiff/query_differ_test.go @@ -21,19 +21,19 @@ import ( "strings" "testing" - "github.com/liquidata-inc/go-mysql-server/enginetest" - "github.com/liquidata-inc/go-mysql-server/sql" - "github.com/liquidata-inc/go-mysql-server/sql/expression" - "github.com/liquidata-inc/go-mysql-server/sql/plan" + "github.com/dolthub/go-mysql-server/enginetest" + "github.com/dolthub/go-mysql-server/sql" + "github.com/dolthub/go-mysql-server/sql/expression" + "github.com/dolthub/go-mysql-server/sql/plan" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/cmd/dolt/cli" - "github.com/liquidata-inc/dolt/go/cmd/dolt/commands" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/diff/querydiff" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/dtestutils" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/env" - det "github.com/liquidata-inc/dolt/go/libraries/doltcore/sqle/enginetest" + "github.com/dolthub/dolt/go/cmd/dolt/cli" + "github.com/dolthub/dolt/go/cmd/dolt/commands" + "github.com/dolthub/dolt/go/libraries/doltcore/diff/querydiff" + "github.com/dolthub/dolt/go/libraries/doltcore/dtestutils" + "github.com/dolthub/dolt/go/libraries/doltcore/env" + det "github.com/dolthub/dolt/go/libraries/doltcore/sqle/enginetest" ) type queryDifferTest struct { diff --git a/go/libraries/doltcore/diff/schema_diff.go b/go/libraries/doltcore/diff/schema_diff.go index 2cf4086197..4c71af1aed 100644 --- a/go/libraries/doltcore/diff/schema_diff.go +++ b/go/libraries/doltcore/diff/schema_diff.go @@ -17,8 +17,8 @@ package diff import ( "reflect" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" ) type SchemaChangeType int diff --git a/go/libraries/doltcore/diff/schema_diff_test.go b/go/libraries/doltcore/diff/schema_diff_test.go index 56c7942d80..3d5d5a08b4 100644 --- a/go/libraries/doltcore/diff/schema_diff_test.go +++ b/go/libraries/doltcore/diff/schema_diff_test.go @@ -18,8 +18,8 @@ import ( "reflect" "testing" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/store/types" ) func TestDiffSchemas(t *testing.T) { diff --git a/go/libraries/doltcore/diff/sql_diff.go b/go/libraries/doltcore/diff/sql_diff.go index cbd87d401e..7805a486a7 100644 --- a/go/libraries/doltcore/diff/sql_diff.go +++ b/go/libraries/doltcore/diff/sql_diff.go @@ -18,12 +18,12 @@ import ( "errors" "io" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/sqle/sqlfmt" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/pipeline" - "github.com/liquidata-inc/dolt/go/libraries/utils/iohelp" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/sqle/sqlfmt" + "github.com/dolthub/dolt/go/libraries/doltcore/table/pipeline" + "github.com/dolthub/dolt/go/libraries/utils/iohelp" + "github.com/dolthub/dolt/go/store/types" ) type SQLDiffSink struct { diff --git a/go/libraries/doltcore/doltdb/commit.go b/go/libraries/doltcore/doltdb/commit.go index 8698aa06dc..aa3da993bf 100644 --- a/go/libraries/doltcore/doltdb/commit.go +++ b/go/libraries/doltcore/doltdb/commit.go @@ -18,9 +18,9 @@ import ( "context" "errors" - "github.com/liquidata-inc/dolt/go/store/datas" - "github.com/liquidata-inc/dolt/go/store/hash" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/datas" + "github.com/dolthub/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/types" ) const ( diff --git a/go/libraries/doltcore/doltdb/commit_itr.go b/go/libraries/doltcore/doltdb/commit_itr.go index c48ba89e7e..e23b996e55 100644 --- a/go/libraries/doltcore/doltdb/commit_itr.go +++ b/go/libraries/doltcore/doltdb/commit_itr.go @@ -19,8 +19,8 @@ import ( "errors" "io" - "github.com/liquidata-inc/dolt/go/store/hash" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/types" ) // CommitItr is an interface for iterating over a set of unique commits diff --git a/go/libraries/doltcore/doltdb/commit_meta.go b/go/libraries/doltcore/doltdb/commit_meta.go index 4348cc5915..f744be07a3 100644 --- a/go/libraries/doltcore/doltdb/commit_meta.go +++ b/go/libraries/doltcore/doltdb/commit_meta.go @@ -20,7 +20,7 @@ import ( "strings" "time" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) const ( diff --git a/go/libraries/doltcore/doltdb/commit_meta_test.go b/go/libraries/doltcore/doltdb/commit_meta_test.go index 1456fc079f..68718232b5 100644 --- a/go/libraries/doltcore/doltdb/commit_meta_test.go +++ b/go/libraries/doltcore/doltdb/commit_meta_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) func TestCommitMetaToAndFromNomsStruct(t *testing.T) { diff --git a/go/libraries/doltcore/doltdb/commit_spec.go b/go/libraries/doltcore/doltdb/commit_spec.go index 1a42accef2..66c38c551e 100644 --- a/go/libraries/doltcore/doltdb/commit_spec.go +++ b/go/libraries/doltcore/doltdb/commit_spec.go @@ -18,7 +18,7 @@ import ( "regexp" "strings" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/ref" + "github.com/dolthub/dolt/go/libraries/doltcore/ref" ) var hashRegex = regexp.MustCompile(`^[0-9a-v]{32}$`) diff --git a/go/libraries/doltcore/doltdb/commit_spec_test.go b/go/libraries/doltcore/doltdb/commit_spec_test.go index 4f343926a2..dc9076e14d 100644 --- a/go/libraries/doltcore/doltdb/commit_spec_test.go +++ b/go/libraries/doltcore/doltdb/commit_spec_test.go @@ -17,8 +17,8 @@ package doltdb import ( "testing" - "github.com/liquidata-inc/dolt/go/libraries/utils/test" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/libraries/utils/test" + "github.com/dolthub/dolt/go/store/hash" ) func TestCommitRegex(t *testing.T) { diff --git a/go/libraries/doltcore/doltdb/conflict.go b/go/libraries/doltcore/doltdb/conflict.go index cfcd5fd9d7..6ece9a44f3 100644 --- a/go/libraries/doltcore/doltdb/conflict.go +++ b/go/libraries/doltcore/doltdb/conflict.go @@ -14,7 +14,7 @@ package doltdb -import "github.com/liquidata-inc/dolt/go/store/types" +import "github.com/dolthub/dolt/go/store/types" type Conflict struct { Base types.Value diff --git a/go/libraries/doltcore/doltdb/doltdb.go b/go/libraries/doltcore/doltdb/doltdb.go index 060c87a20b..3e27fff3a9 100644 --- a/go/libraries/doltcore/doltdb/doltdb.go +++ b/go/libraries/doltcore/doltdb/doltdb.go @@ -21,17 +21,17 @@ import ( "strings" "time" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/dbfactory" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/ref" - "github.com/liquidata-inc/dolt/go/store/chunks" - "github.com/liquidata-inc/dolt/go/store/spec" - "github.com/liquidata-inc/dolt/go/store/types/edits" + "github.com/dolthub/dolt/go/libraries/doltcore/dbfactory" + "github.com/dolthub/dolt/go/libraries/doltcore/ref" + "github.com/dolthub/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/spec" + "github.com/dolthub/dolt/go/store/types/edits" - "github.com/liquidata-inc/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/dolt/go/libraries/utils/pantoerr" - "github.com/liquidata-inc/dolt/go/store/datas" - "github.com/liquidata-inc/dolt/go/store/hash" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/utils/filesys" + "github.com/dolthub/dolt/go/libraries/utils/pantoerr" + "github.com/dolthub/dolt/go/store/datas" + "github.com/dolthub/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/types" ) func init() { diff --git a/go/libraries/doltcore/doltdb/doltdb_test.go b/go/libraries/doltcore/doltdb/doltdb_test.go index e43b8d16dd..3758d0364f 100644 --- a/go/libraries/doltcore/doltdb/doltdb_test.go +++ b/go/libraries/doltcore/doltdb/doltdb_test.go @@ -23,13 +23,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/dbfactory" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/ref" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/dolt/go/libraries/utils/test" - "github.com/liquidata-inc/dolt/go/store/hash" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/dbfactory" + "github.com/dolthub/dolt/go/libraries/doltcore/ref" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/utils/filesys" + "github.com/dolthub/dolt/go/libraries/utils/test" + "github.com/dolthub/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/types" ) const ( diff --git a/go/libraries/doltcore/doltdb/foreign_key_coll.go b/go/libraries/doltcore/doltdb/foreign_key_coll.go index 7019ae9bc6..b8f12552c7 100644 --- a/go/libraries/doltcore/doltdb/foreign_key_coll.go +++ b/go/libraries/doltcore/doltdb/foreign_key_coll.go @@ -23,14 +23,14 @@ import ( "sort" "strings" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/rowconv" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/typed/noms" - "github.com/liquidata-inc/dolt/go/libraries/utils/set" - "github.com/liquidata-inc/dolt/go/store/hash" - "github.com/liquidata-inc/dolt/go/store/marshal" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/rowconv" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/table/typed/noms" + "github.com/dolthub/dolt/go/libraries/utils/set" + "github.com/dolthub/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/marshal" + "github.com/dolthub/dolt/go/store/types" ) type ForeignKeyCollection struct { diff --git a/go/libraries/doltcore/doltdb/foreign_key_test.go b/go/libraries/doltcore/doltdb/foreign_key_test.go index 2f61ac1362..688095c9af 100644 --- a/go/libraries/doltcore/doltdb/foreign_key_test.go +++ b/go/libraries/doltcore/doltdb/foreign_key_test.go @@ -21,10 +21,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/cmd/dolt/cli" - "github.com/liquidata-inc/dolt/go/cmd/dolt/commands" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/dtestutils" + "github.com/dolthub/dolt/go/cmd/dolt/cli" + "github.com/dolthub/dolt/go/cmd/dolt/commands" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/dtestutils" ) func TestForeignKeys(t *testing.T) { diff --git a/go/libraries/doltcore/doltdb/index_editor.go b/go/libraries/doltcore/doltdb/index_editor.go index cc6268d236..e214fd87b8 100644 --- a/go/libraries/doltcore/doltdb/index_editor.go +++ b/go/libraries/doltcore/doltdb/index_editor.go @@ -20,12 +20,12 @@ import ( "io" "sync" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/typed/noms" - "github.com/liquidata-inc/dolt/go/store/hash" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/table" + "github.com/dolthub/dolt/go/libraries/doltcore/table/typed/noms" + "github.com/dolthub/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/types" ) // IndexEditor takes in changes to an index map and returns the updated map if changes have been made. diff --git a/go/libraries/doltcore/doltdb/index_editor_test.go b/go/libraries/doltcore/doltdb/index_editor_test.go index 31299ec6e2..75dd69b2ed 100644 --- a/go/libraries/doltcore/doltdb/index_editor_test.go +++ b/go/libraries/doltcore/doltdb/index_editor_test.go @@ -22,10 +22,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/dbfactory" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/dbfactory" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/store/types" ) // The number of times we will loop through the tests to ensure consistent results diff --git a/go/libraries/doltcore/doltdb/key_itr.go b/go/libraries/doltcore/doltdb/key_itr.go index a55e47bb0f..e554937c71 100644 --- a/go/libraries/doltcore/doltdb/key_itr.go +++ b/go/libraries/doltcore/doltdb/key_itr.go @@ -17,9 +17,9 @@ package doltdb import ( "context" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/store/types" ) // PKItr defines a function that iterates over a collection of noms values. The PKItr will return a valid value diff --git a/go/libraries/doltcore/doltdb/root_val.go b/go/libraries/doltcore/doltdb/root_val.go index 9569925ed6..835d22c265 100644 --- a/go/libraries/doltcore/doltdb/root_val.go +++ b/go/libraries/doltcore/doltdb/root_val.go @@ -21,12 +21,12 @@ import ( "strconv" "strings" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema/encoding" - "github.com/liquidata-inc/dolt/go/libraries/utils/set" - "github.com/liquidata-inc/dolt/go/store/hash" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/schema/encoding" + "github.com/dolthub/dolt/go/libraries/utils/set" + "github.com/dolthub/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/types" ) const ( diff --git a/go/libraries/doltcore/doltdb/root_val_test.go b/go/libraries/doltcore/doltdb/root_val_test.go index f49fc9d20d..2ce8d989b6 100644 --- a/go/libraries/doltcore/doltdb/root_val_test.go +++ b/go/libraries/doltcore/doltdb/root_val_test.go @@ -20,9 +20,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/store/types" ) func TestTableDiff(t *testing.T) { diff --git a/go/libraries/doltcore/doltdb/sessioned_table_editor.go b/go/libraries/doltcore/doltdb/sessioned_table_editor.go index 4ec16051a1..bf04468871 100644 --- a/go/libraries/doltcore/doltdb/sessioned_table_editor.go +++ b/go/libraries/doltcore/doltdb/sessioned_table_editor.go @@ -18,8 +18,8 @@ import ( "context" "fmt" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/store/types" ) // SessionedTableEditor represents a table editor obtained from a TableEditSession. This table editor may be shared diff --git a/go/libraries/doltcore/doltdb/system_table.go b/go/libraries/doltcore/doltdb/system_table.go index d04bea89b4..731b4620b9 100644 --- a/go/libraries/doltcore/doltdb/system_table.go +++ b/go/libraries/doltcore/doltdb/system_table.go @@ -20,10 +20,10 @@ import ( "sort" "strings" - "github.com/liquidata-inc/dolt/go/libraries/utils/funcitr" + "github.com/dolthub/dolt/go/libraries/utils/funcitr" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/utils/set" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/utils/set" ) const ( @@ -158,7 +158,7 @@ const ( ) // Tags for dolt_docs table -// for info on unaligned constant: https://github.com/liquidata-inc/dolt/pull/663 +// for info on unaligned constant: https://github.com/dolthub/dolt/pull/663 const ( // DocNameTag is the tag of the name column in the docs table DocNameTag = iota + SystemTableReservedMin + uint64(5) @@ -187,7 +187,7 @@ const ( ) // Tags for dolt_query_catalog table -// for info on unaligned constant: https://github.com/liquidata-inc/dolt/pull/663 +// for info on unaligned constant: https://github.com/dolthub/dolt/pull/663 const ( // QueryCatalogIdTag is the tag of the id column in the query catalog table QueryCatalogIdTag = iota + SystemTableReservedMin + uint64(3005) @@ -216,7 +216,7 @@ const ( ) // Tags for dolt_schemas table -// for info on unaligned constant: https://github.com/liquidata-inc/dolt/pull/663 +// for info on unaligned constant: https://github.com/dolthub/dolt/pull/663 const ( DoltSchemasTypeTag = iota + SystemTableReservedMin + uint64(4003) DoltSchemasNameTag diff --git a/go/libraries/doltcore/doltdb/table.go b/go/libraries/doltcore/doltdb/table.go index d073f2e1fb..ed827cf5d1 100644 --- a/go/libraries/doltcore/doltdb/table.go +++ b/go/libraries/doltcore/doltdb/table.go @@ -20,11 +20,11 @@ import ( "fmt" "regexp" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema/encoding" - "github.com/liquidata-inc/dolt/go/store/hash" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/schema/encoding" + "github.com/dolthub/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/types" ) const ( diff --git a/go/libraries/doltcore/doltdb/table_edit_session.go b/go/libraries/doltcore/doltdb/table_edit_session.go index b7285c8e4a..ef0006f7ab 100644 --- a/go/libraries/doltcore/doltdb/table_edit_session.go +++ b/go/libraries/doltcore/doltdb/table_edit_session.go @@ -19,10 +19,10 @@ import ( "fmt" "sync" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/store/types" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" ) // TableEditSession handles all edit operations on a table that may also update other tables. Serves as coordination diff --git a/go/libraries/doltcore/doltdb/table_editor.go b/go/libraries/doltcore/doltdb/table_editor.go index fce9c504e4..6c5c3cc7aa 100644 --- a/go/libraries/doltcore/doltdb/table_editor.go +++ b/go/libraries/doltcore/doltdb/table_editor.go @@ -21,15 +21,15 @@ import ( "strings" "sync" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/typed/noms" + "github.com/dolthub/dolt/go/libraries/doltcore/table" + "github.com/dolthub/dolt/go/libraries/doltcore/table/typed/noms" - "github.com/liquidata-inc/dolt/go/cmd/dolt/errhand" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/utils/async" - "github.com/liquidata-inc/dolt/go/store/hash" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/cmd/dolt/errhand" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/utils/async" + "github.com/dolthub/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/types" ) var ErrDuplicatePrimaryKeyFmt = "duplicate primary key given: %v" diff --git a/go/libraries/doltcore/doltdb/table_editor_test.go b/go/libraries/doltcore/doltdb/table_editor_test.go index 7a545f2591..98efdb8607 100644 --- a/go/libraries/doltcore/doltdb/table_editor_test.go +++ b/go/libraries/doltcore/doltdb/table_editor_test.go @@ -22,11 +22,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/dbfactory" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema/encoding" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/dbfactory" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/schema/encoding" + "github.com/dolthub/dolt/go/store/types" ) // The number of times we will loop through the tests to ensure consistent results diff --git a/go/libraries/doltcore/doltdb/table_test.go b/go/libraries/doltcore/doltdb/table_test.go index b330c7a203..a234f9c5d8 100644 --- a/go/libraries/doltcore/doltdb/table_test.go +++ b/go/libraries/doltcore/doltdb/table_test.go @@ -22,11 +22,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/dbfactory" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema/encoding" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/dbfactory" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/schema/encoding" + "github.com/dolthub/dolt/go/store/types" ) var id0, _ = uuid.NewRandom() @@ -547,7 +547,7 @@ func rowsToIndexRows(t *testing.T, rows []row.Row, indexName schema.Index, index // DO NOT CHANGE THIS TEST // It is necessary to ensure consistent system table definitions -// for more info: https://github.com/liquidata-inc/dolt/pull/663 +// for more info: https://github.com/dolthub/dolt/pull/663 func TestSystemTableTags(t *testing.T) { var sysTableMin uint64 = 1 << 51 diff --git a/go/libraries/doltcore/doltdb/tag.go b/go/libraries/doltcore/doltdb/tag.go index faf1f2c39e..ac6e84bc7e 100644 --- a/go/libraries/doltcore/doltdb/tag.go +++ b/go/libraries/doltcore/doltdb/tag.go @@ -18,9 +18,9 @@ import ( "context" "fmt" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/ref" - "github.com/liquidata-inc/dolt/go/store/datas" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/ref" + "github.com/dolthub/dolt/go/store/datas" + "github.com/dolthub/dolt/go/store/types" ) type Tag struct { diff --git a/go/libraries/doltcore/doltdb/tag_meta.go b/go/libraries/doltcore/doltdb/tag_meta.go index b8f1f85376..02851845bc 100644 --- a/go/libraries/doltcore/doltdb/tag_meta.go +++ b/go/libraries/doltcore/doltdb/tag_meta.go @@ -19,7 +19,7 @@ import ( "strings" "time" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) const ( diff --git a/go/libraries/doltcore/doltdb/tag_meta_test.go b/go/libraries/doltcore/doltdb/tag_meta_test.go index 9705a2b5db..532818f8b7 100644 --- a/go/libraries/doltcore/doltdb/tag_meta_test.go +++ b/go/libraries/doltcore/doltdb/tag_meta_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) func TestTagMetaToAndFromNomsStruct(t *testing.T) { diff --git a/go/libraries/doltcore/dtestutils/data.go b/go/libraries/doltcore/dtestutils/data.go index c6cd90e1a4..b67871b34b 100644 --- a/go/libraries/doltcore/dtestutils/data.go +++ b/go/libraries/doltcore/dtestutils/data.go @@ -21,13 +21,13 @@ import ( "github.com/google/uuid" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/untyped" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/env" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/table" + "github.com/dolthub/dolt/go/libraries/doltcore/table/untyped" + "github.com/dolthub/dolt/go/store/types" ) var UUIDS = []uuid.UUID{ diff --git a/go/libraries/doltcore/dtestutils/environment.go b/go/libraries/doltcore/dtestutils/environment.go index b3a943e49b..8c940afc86 100644 --- a/go/libraries/doltcore/dtestutils/environment.go +++ b/go/libraries/doltcore/dtestutils/environment.go @@ -17,10 +17,10 @@ package dtestutils import ( "context" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/env" + "github.com/dolthub/dolt/go/libraries/utils/filesys" + "github.com/dolthub/dolt/go/store/types" ) const ( diff --git a/go/libraries/doltcore/dtestutils/schema.go b/go/libraries/doltcore/dtestutils/schema.go index b18503a7c1..1a019d43d9 100644 --- a/go/libraries/doltcore/dtestutils/schema.go +++ b/go/libraries/doltcore/dtestutils/schema.go @@ -22,12 +22,12 @@ import ( "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/typed/noms" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/env" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/table" + "github.com/dolthub/dolt/go/libraries/doltcore/table/typed/noms" + "github.com/dolthub/dolt/go/store/types" ) // CreateSchema returns a schema from the columns given, panicking on any errors. diff --git a/go/libraries/doltcore/dtestutils/testcommands/command.go b/go/libraries/doltcore/dtestutils/testcommands/command.go index a78c87abf7..9eefdbe672 100644 --- a/go/libraries/doltcore/dtestutils/testcommands/command.go +++ b/go/libraries/doltcore/dtestutils/testcommands/command.go @@ -24,13 +24,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/cmd/dolt/commands/cnfcmds" - "github.com/liquidata-inc/dolt/go/cmd/dolt/errhand" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/env/actions" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/merge" - dsqle "github.com/liquidata-inc/dolt/go/libraries/doltcore/sqle" + "github.com/dolthub/dolt/go/cmd/dolt/commands/cnfcmds" + "github.com/dolthub/dolt/go/cmd/dolt/errhand" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/env" + "github.com/dolthub/dolt/go/libraries/doltcore/env/actions" + "github.com/dolthub/dolt/go/libraries/doltcore/merge" + dsqle "github.com/dolthub/dolt/go/libraries/doltcore/sqle" ) type Command interface { diff --git a/go/libraries/doltcore/env/actions/branch.go b/go/libraries/doltcore/env/actions/branch.go index d1ec1affb9..6754da9078 100644 --- a/go/libraries/doltcore/env/actions/branch.go +++ b/go/libraries/doltcore/env/actions/branch.go @@ -18,12 +18,12 @@ import ( "context" "errors" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/ref" - "github.com/liquidata-inc/dolt/go/libraries/utils/set" - "github.com/liquidata-inc/dolt/go/store/hash" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/env" + "github.com/dolthub/dolt/go/libraries/doltcore/ref" + "github.com/dolthub/dolt/go/libraries/utils/set" + "github.com/dolthub/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/types" ) var ErrAlreadyExists = errors.New("already exists") diff --git a/go/libraries/doltcore/env/actions/commit.go b/go/libraries/doltcore/env/actions/commit.go index 9cd61341fe..5e233ef9b1 100644 --- a/go/libraries/doltcore/env/actions/commit.go +++ b/go/libraries/doltcore/env/actions/commit.go @@ -20,11 +20,11 @@ import ( "sort" "time" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/diff" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/dolt/go/libraries/utils/config" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/libraries/doltcore/diff" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/env" + "github.com/dolthub/dolt/go/libraries/utils/config" + "github.com/dolthub/dolt/go/store/hash" ) var ErrNameNotConfigured = errors.New("name not configured") diff --git a/go/libraries/doltcore/env/actions/commitwalk/commitwalk.go b/go/libraries/doltcore/env/actions/commitwalk/commitwalk.go index ed748a29bd..d0e2eeb37e 100644 --- a/go/libraries/doltcore/env/actions/commitwalk/commitwalk.go +++ b/go/libraries/doltcore/env/actions/commitwalk/commitwalk.go @@ -18,8 +18,8 @@ import ( "context" "io" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/store/hash" ) type c struct { diff --git a/go/libraries/doltcore/env/actions/commitwalk/commitwalk_test.go b/go/libraries/doltcore/env/actions/commitwalk/commitwalk_test.go index e66242d4d1..30ef84291b 100644 --- a/go/libraries/doltcore/env/actions/commitwalk/commitwalk_test.go +++ b/go/libraries/doltcore/env/actions/commitwalk/commitwalk_test.go @@ -21,13 +21,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/ref" - "github.com/liquidata-inc/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/dolt/go/store/datas" - "github.com/liquidata-inc/dolt/go/store/hash" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/env" + "github.com/dolthub/dolt/go/libraries/doltcore/ref" + "github.com/dolthub/dolt/go/libraries/utils/filesys" + "github.com/dolthub/dolt/go/store/datas" + "github.com/dolthub/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/types" ) const ( diff --git a/go/libraries/doltcore/env/actions/creds.go b/go/libraries/doltcore/env/actions/creds.go index 4674aa4a45..4f7fc39578 100644 --- a/go/libraries/doltcore/env/actions/creds.go +++ b/go/libraries/doltcore/env/actions/creds.go @@ -15,9 +15,9 @@ package actions import ( - "github.com/liquidata-inc/dolt/go/cmd/dolt/errhand" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/creds" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/env" + "github.com/dolthub/dolt/go/cmd/dolt/errhand" + "github.com/dolthub/dolt/go/libraries/doltcore/creds" + "github.com/dolthub/dolt/go/libraries/doltcore/env" ) func NewCredsFile(dEnv *env.DoltEnv) (string, creds.DoltCreds, errhand.VerboseError) { diff --git a/go/libraries/doltcore/env/actions/docs.go b/go/libraries/doltcore/env/actions/docs.go index cc1afd4842..3c3a151c1a 100644 --- a/go/libraries/doltcore/env/actions/docs.go +++ b/go/libraries/doltcore/env/actions/docs.go @@ -17,9 +17,9 @@ package actions import ( "context" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/diff" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/env" + "github.com/dolthub/dolt/go/libraries/doltcore/diff" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/env" ) // SaveTrackedDocsFromWorking saves docs from the working root to the filesystem, and doesn't modify untracked docs. diff --git a/go/libraries/doltcore/env/actions/errors.go b/go/libraries/doltcore/env/actions/errors.go index 8e1bb626f7..f49c234a65 100644 --- a/go/libraries/doltcore/env/actions/errors.go +++ b/go/libraries/doltcore/env/actions/errors.go @@ -17,7 +17,7 @@ package actions import ( "strings" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/diff" + "github.com/dolthub/dolt/go/libraries/doltcore/diff" ) type tblErrorType string diff --git a/go/libraries/doltcore/env/actions/infer_schema.go b/go/libraries/doltcore/env/actions/infer_schema.go index d1e75f3629..9708071957 100644 --- a/go/libraries/doltcore/env/actions/infer_schema.go +++ b/go/libraries/doltcore/env/actions/infer_schema.go @@ -23,14 +23,14 @@ import ( "github.com/google/uuid" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/rowconv" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema/typeinfo" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/pipeline" - "github.com/liquidata-inc/dolt/go/libraries/utils/set" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/rowconv" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/schema/typeinfo" + "github.com/dolthub/dolt/go/libraries/doltcore/table" + "github.com/dolthub/dolt/go/libraries/doltcore/table/pipeline" + "github.com/dolthub/dolt/go/libraries/utils/set" + "github.com/dolthub/dolt/go/store/types" ) type typeInfoSet map[typeinfo.TypeInfo]struct{} diff --git a/go/libraries/doltcore/env/actions/infer_schema_test.go b/go/libraries/doltcore/env/actions/infer_schema_test.go index d91bf69fe7..29bbf8dc1b 100644 --- a/go/libraries/doltcore/env/actions/infer_schema_test.go +++ b/go/libraries/doltcore/env/actions/infer_schema_test.go @@ -25,13 +25,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/dtestutils" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/rowconv" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema/typeinfo" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/untyped/csv" - "github.com/liquidata-inc/dolt/go/libraries/utils/set" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/dtestutils" + "github.com/dolthub/dolt/go/libraries/doltcore/rowconv" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/schema/typeinfo" + "github.com/dolthub/dolt/go/libraries/doltcore/table/untyped/csv" + "github.com/dolthub/dolt/go/libraries/utils/set" + "github.com/dolthub/dolt/go/store/types" ) var maxIntPlusTwo uint64 = 1<<63 + 1 diff --git a/go/libraries/doltcore/env/actions/remotes.go b/go/libraries/doltcore/env/actions/remotes.go index d0bdee8887..545efae8b3 100644 --- a/go/libraries/doltcore/env/actions/remotes.go +++ b/go/libraries/doltcore/env/actions/remotes.go @@ -18,10 +18,10 @@ import ( "context" "errors" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/ref" - "github.com/liquidata-inc/dolt/go/store/datas" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/env" + "github.com/dolthub/dolt/go/libraries/doltcore/ref" + "github.com/dolthub/dolt/go/store/datas" ) var ErrCantFF = errors.New("can't fast forward merge") diff --git a/go/libraries/doltcore/env/actions/resolve.go b/go/libraries/doltcore/env/actions/resolve.go index 34f5db91e9..ac6980ddc1 100644 --- a/go/libraries/doltcore/env/actions/resolve.go +++ b/go/libraries/doltcore/env/actions/resolve.go @@ -17,9 +17,9 @@ package actions import ( "context" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/merge" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/env" + "github.com/dolthub/dolt/go/libraries/doltcore/merge" ) type AutoResolveStats struct { diff --git a/go/libraries/doltcore/env/actions/staged.go b/go/libraries/doltcore/env/actions/staged.go index 9202754124..1fa19b3d41 100644 --- a/go/libraries/doltcore/env/actions/staged.go +++ b/go/libraries/doltcore/env/actions/staged.go @@ -18,8 +18,8 @@ import ( "context" "errors" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/env" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/env" ) var ErrTablesInConflict = errors.New("table is in conflict") diff --git a/go/libraries/doltcore/env/actions/table.go b/go/libraries/doltcore/env/actions/table.go index fa5a0ad774..eabf2336c1 100644 --- a/go/libraries/doltcore/env/actions/table.go +++ b/go/libraries/doltcore/env/actions/table.go @@ -17,10 +17,10 @@ package actions import ( "context" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/diff" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/dolt/go/libraries/utils/set" + "github.com/dolthub/dolt/go/libraries/doltcore/diff" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/env" + "github.com/dolthub/dolt/go/libraries/utils/set" ) func CheckoutAllTables(ctx context.Context, dEnv *env.DoltEnv) error { diff --git a/go/libraries/doltcore/env/actions/tag.go b/go/libraries/doltcore/env/actions/tag.go index 21811cbe99..0b8e19cc9b 100644 --- a/go/libraries/doltcore/env/actions/tag.go +++ b/go/libraries/doltcore/env/actions/tag.go @@ -19,9 +19,9 @@ import ( "fmt" "sort" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/ref" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/env" + "github.com/dolthub/dolt/go/libraries/doltcore/ref" ) type TagProps struct { diff --git a/go/libraries/doltcore/env/config.go b/go/libraries/doltcore/env/config.go index 3c4956049f..238c0b1b00 100644 --- a/go/libraries/doltcore/env/config.go +++ b/go/libraries/doltcore/env/config.go @@ -19,11 +19,11 @@ import ( "path/filepath" "strings" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/dbfactory" + "github.com/dolthub/dolt/go/libraries/doltcore/dbfactory" - "github.com/liquidata-inc/dolt/go/libraries/utils/config" - "github.com/liquidata-inc/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/dolt/go/libraries/utils/set" + "github.com/dolthub/dolt/go/libraries/utils/config" + "github.com/dolthub/dolt/go/libraries/utils/filesys" + "github.com/dolthub/dolt/go/libraries/utils/set" ) const ( diff --git a/go/libraries/doltcore/env/dolt_docs.go b/go/libraries/doltcore/env/dolt_docs.go index d71a0b1726..2f8cd6e808 100644 --- a/go/libraries/doltcore/env/dolt_docs.go +++ b/go/libraries/doltcore/env/dolt_docs.go @@ -15,10 +15,10 @@ package env import ( - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/utils/filesys" + "github.com/dolthub/dolt/go/store/types" ) type Docs []doltdb.DocDetails diff --git a/go/libraries/doltcore/env/environment.go b/go/libraries/doltcore/env/environment.go index 85da641b1b..e8f1c915f0 100644 --- a/go/libraries/doltcore/env/environment.go +++ b/go/libraries/doltcore/env/environment.go @@ -28,20 +28,20 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials" - "github.com/liquidata-inc/dolt/go/cmd/dolt/errhand" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/creds" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/dbfactory" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/grpcendpoint" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/ref" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema/encoding" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/typed/noms" - "github.com/liquidata-inc/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/dolt/go/store/hash" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/cmd/dolt/errhand" + "github.com/dolthub/dolt/go/libraries/doltcore/creds" + "github.com/dolthub/dolt/go/libraries/doltcore/dbfactory" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/grpcendpoint" + "github.com/dolthub/dolt/go/libraries/doltcore/ref" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/schema/encoding" + "github.com/dolthub/dolt/go/libraries/doltcore/table" + "github.com/dolthub/dolt/go/libraries/doltcore/table/typed/noms" + "github.com/dolthub/dolt/go/libraries/utils/filesys" + "github.com/dolthub/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/types" ) const ( diff --git a/go/libraries/doltcore/env/environment_test.go b/go/libraries/doltcore/env/environment_test.go index 7184d499df..2a141d601b 100644 --- a/go/libraries/doltcore/env/environment_test.go +++ b/go/libraries/doltcore/env/environment_test.go @@ -23,12 +23,12 @@ import ( "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/dbfactory" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/ref" - "github.com/liquidata-inc/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/dolt/go/store/hash" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/dbfactory" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/ref" + "github.com/dolthub/dolt/go/libraries/utils/filesys" + "github.com/dolthub/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/types" ) const ( diff --git a/go/libraries/doltcore/env/multi_repo_env.go b/go/libraries/doltcore/env/multi_repo_env.go index d54de33c21..a5a09187ad 100644 --- a/go/libraries/doltcore/env/multi_repo_env.go +++ b/go/libraries/doltcore/env/multi_repo_env.go @@ -23,11 +23,11 @@ import ( "strings" "unicode" - "github.com/liquidata-inc/dolt/go/libraries/utils/earl" + "github.com/dolthub/dolt/go/libraries/utils/earl" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/dbfactory" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/utils/filesys" + "github.com/dolthub/dolt/go/libraries/doltcore/dbfactory" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/utils/filesys" ) // EnvNameAndPath is a simple tuple of the name of an environment and the path to where it is on disk diff --git a/go/libraries/doltcore/env/multi_repo_env_test.go b/go/libraries/doltcore/env/multi_repo_env_test.go index 781cb00a79..8d07ecbf3e 100644 --- a/go/libraries/doltcore/env/multi_repo_env_test.go +++ b/go/libraries/doltcore/env/multi_repo_env_test.go @@ -23,10 +23,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/libraries/utils/earl" - "github.com/liquidata-inc/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/dolt/go/libraries/utils/test" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/utils/earl" + "github.com/dolthub/dolt/go/libraries/utils/filesys" + "github.com/dolthub/dolt/go/libraries/utils/test" + "github.com/dolthub/dolt/go/store/types" ) func TestDirToDBName(t *testing.T) { diff --git a/go/libraries/doltcore/env/paths.go b/go/libraries/doltcore/env/paths.go index a513b09ecc..d735d7f4dc 100644 --- a/go/libraries/doltcore/env/paths.go +++ b/go/libraries/doltcore/env/paths.go @@ -19,7 +19,7 @@ import ( "os/user" "path/filepath" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/dbfactory" + "github.com/dolthub/dolt/go/libraries/doltcore/dbfactory" ) const ( diff --git a/go/libraries/doltcore/env/paths_test.go b/go/libraries/doltcore/env/paths_test.go index d7f893d10c..03468cc3c5 100644 --- a/go/libraries/doltcore/env/paths_test.go +++ b/go/libraries/doltcore/env/paths_test.go @@ -18,7 +18,7 @@ import ( "path/filepath" "testing" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/dbfactory" + "github.com/dolthub/dolt/go/libraries/doltcore/dbfactory" ) func TestGetGlobalCfgPath(t *testing.T) { diff --git a/go/libraries/doltcore/env/remotes.go b/go/libraries/doltcore/env/remotes.go index 780d51f1db..693abf0c06 100644 --- a/go/libraries/doltcore/env/remotes.go +++ b/go/libraries/doltcore/env/remotes.go @@ -17,8 +17,8 @@ package env import ( "context" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/store/types" ) var NoRemote = Remote{} diff --git a/go/libraries/doltcore/env/repo_state.go b/go/libraries/doltcore/env/repo_state.go index e5137a3be6..b0d6f28e75 100644 --- a/go/libraries/doltcore/env/repo_state.go +++ b/go/libraries/doltcore/env/repo_state.go @@ -18,10 +18,10 @@ import ( "context" "encoding/json" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/ref" - "github.com/liquidata-inc/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/ref" + "github.com/dolthub/dolt/go/libraries/utils/filesys" + "github.com/dolthub/dolt/go/store/hash" ) type RepoStateReader interface { diff --git a/go/libraries/doltcore/envtestutils/history.go b/go/libraries/doltcore/envtestutils/history.go index 7f07077b8e..f1c2a4e787 100644 --- a/go/libraries/doltcore/envtestutils/history.go +++ b/go/libraries/doltcore/envtestutils/history.go @@ -20,13 +20,13 @@ import ( "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/ref" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema/encoding" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/env" + "github.com/dolthub/dolt/go/libraries/doltcore/ref" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/schema/encoding" + "github.com/dolthub/dolt/go/store/types" ) // TableUpdate defines a list of modifications that should be made to a table diff --git a/go/libraries/doltcore/envtestutils/rebase_tag_test.go b/go/libraries/doltcore/envtestutils/rebase_tag_test.go index ae3ab30e12..7868f3b47b 100644 --- a/go/libraries/doltcore/envtestutils/rebase_tag_test.go +++ b/go/libraries/doltcore/envtestutils/rebase_tag_test.go @@ -20,22 +20,22 @@ import ( "io" "testing" - "github.com/liquidata-inc/go-mysql-server/sql" - "github.com/liquidata-inc/vitess/go/sqltypes" + "github.com/dolthub/go-mysql-server/sql" + "github.com/dolthub/vitess/go/sqltypes" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - dtu "github.com/liquidata-inc/dolt/go/libraries/doltcore/dtestutils" - tc "github.com/liquidata-inc/dolt/go/libraries/doltcore/dtestutils/testcommands" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/rebase" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema/typeinfo" - dsqle "github.com/liquidata-inc/dolt/go/libraries/doltcore/sqle" - sqleSchema "github.com/liquidata-inc/dolt/go/libraries/doltcore/sqle/schema" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + dtu "github.com/dolthub/dolt/go/libraries/doltcore/dtestutils" + tc "github.com/dolthub/dolt/go/libraries/doltcore/dtestutils/testcommands" + "github.com/dolthub/dolt/go/libraries/doltcore/env" + "github.com/dolthub/dolt/go/libraries/doltcore/rebase" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/schema/typeinfo" + dsqle "github.com/dolthub/dolt/go/libraries/doltcore/sqle" + sqleSchema "github.com/dolthub/dolt/go/libraries/doltcore/sqle/schema" + "github.com/dolthub/dolt/go/store/types" ) const ( @@ -274,7 +274,7 @@ var RebaseTagTests = []RebaseTagTest{ newRow(row.TaggedValues{IdTag: types.Int(9), NameTag: types.String("Jacqueline Bouvier"), AgeTag: types.Int(80)}, people), }, }, - // https://github.com/liquidata-inc/dolt/issues/773 + // https://github.com/dolthub/dolt/issues/773 /*{ Name: "create new column on master, insert to table on other branch, merge", Commands: []tc.Command{ diff --git a/go/libraries/doltcore/envtestutils/super_schema_test.go b/go/libraries/doltcore/envtestutils/super_schema_test.go index 9ec3ae91dd..a9a6fedea8 100644 --- a/go/libraries/doltcore/envtestutils/super_schema_test.go +++ b/go/libraries/doltcore/envtestutils/super_schema_test.go @@ -22,10 +22,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/dtestutils" - tc "github.com/liquidata-inc/dolt/go/libraries/doltcore/dtestutils/testcommands" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema/typeinfo" + "github.com/dolthub/dolt/go/libraries/doltcore/dtestutils" + tc "github.com/dolthub/dolt/go/libraries/doltcore/dtestutils/testcommands" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/schema/typeinfo" ) const ( @@ -231,7 +231,7 @@ var SuperSchemaTests = []SuperSchemaTest{ newColTypeInfo("c11", c11Tag, typeinfo.Int32Type, false), )), }, - // https://github.com/liquidata-inc/dolt/issues/773 + // https://github.com/dolthub/dolt/issues/773 /*{ Name: "super schema merge", TableName: "testable", diff --git a/go/libraries/doltcore/merge/conflict_sink.go b/go/libraries/doltcore/merge/conflict_sink.go index 472e26cc3d..1682307b30 100644 --- a/go/libraries/doltcore/merge/conflict_sink.go +++ b/go/libraries/doltcore/merge/conflict_sink.go @@ -22,13 +22,13 @@ import ( "github.com/fatih/color" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/diff" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/pipeline" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/untyped" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/untyped/tabular" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/diff" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/table/pipeline" + "github.com/dolthub/dolt/go/libraries/doltcore/table/untyped" + "github.com/dolthub/dolt/go/libraries/doltcore/table/untyped/tabular" + "github.com/dolthub/dolt/go/store/types" ) var WriteBufSize = 256 * 1024 diff --git a/go/libraries/doltcore/merge/conflict_source.go b/go/libraries/doltcore/merge/conflict_source.go index 3c2494366f..a9a339875b 100644 --- a/go/libraries/doltcore/merge/conflict_source.go +++ b/go/libraries/doltcore/merge/conflict_source.go @@ -19,12 +19,12 @@ import ( "errors" "io" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/rowconv" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/pipeline" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/rowconv" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/table/pipeline" + "github.com/dolthub/dolt/go/store/types" ) const ( diff --git a/go/libraries/doltcore/merge/conflict_splitter.go b/go/libraries/doltcore/merge/conflict_splitter.go index c3957cf30c..f227989267 100644 --- a/go/libraries/doltcore/merge/conflict_splitter.go +++ b/go/libraries/doltcore/merge/conflict_splitter.go @@ -15,12 +15,12 @@ package merge import ( - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/rowconv" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/pipeline" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/untyped" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/rowconv" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/table/pipeline" + "github.com/dolthub/dolt/go/libraries/doltcore/table/untyped" + "github.com/dolthub/dolt/go/store/types" ) // MergeVersion defines which version a value of a row corresponds to diff --git a/go/libraries/doltcore/merge/merge.go b/go/libraries/doltcore/merge/merge.go index eb88ea545a..ad8b1aaa2d 100644 --- a/go/libraries/doltcore/merge/merge.go +++ b/go/libraries/doltcore/merge/merge.go @@ -19,16 +19,16 @@ import ( "errors" "fmt" - "github.com/liquidata-inc/dolt/go/store/atomicerr" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/atomicerr" + "github.com/dolthub/dolt/go/store/hash" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/diff" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/utils/valutil" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/diff" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/env" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/utils/valutil" + "github.com/dolthub/dolt/go/store/types" ) var ErrFastForward = errors.New("fast forward") diff --git a/go/libraries/doltcore/merge/merge_schema.go b/go/libraries/doltcore/merge/merge_schema.go index 421fef3fe8..ee456ed230 100644 --- a/go/libraries/doltcore/merge/merge_schema.go +++ b/go/libraries/doltcore/merge/merge_schema.go @@ -19,8 +19,8 @@ import ( "fmt" "strings" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" ) type conflictKind byte diff --git a/go/libraries/doltcore/merge/merge_schema_test.go b/go/libraries/doltcore/merge/merge_schema_test.go index b20d1e497c..69ddbd4d8c 100644 --- a/go/libraries/doltcore/merge/merge_schema_test.go +++ b/go/libraries/doltcore/merge/merge_schema_test.go @@ -21,14 +21,14 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/cmd/dolt/cli" - "github.com/liquidata-inc/dolt/go/cmd/dolt/commands" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/dtestutils" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/merge" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema/typeinfo" + "github.com/dolthub/dolt/go/cmd/dolt/cli" + "github.com/dolthub/dolt/go/cmd/dolt/commands" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/dtestutils" + "github.com/dolthub/dolt/go/libraries/doltcore/env" + "github.com/dolthub/dolt/go/libraries/doltcore/merge" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/schema/typeinfo" ) func TestMergeSchemas(t *testing.T) { diff --git a/go/libraries/doltcore/merge/merge_test.go b/go/libraries/doltcore/merge/merge_test.go index 281e44f0cf..3f9d693e4a 100644 --- a/go/libraries/doltcore/merge/merge_test.go +++ b/go/libraries/doltcore/merge/merge_test.go @@ -23,11 +23,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/ref" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema/encoding" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/ref" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/schema/encoding" + "github.com/dolthub/dolt/go/store/types" ) func mustTuple(tpl types.Tuple, err error) types.Tuple { diff --git a/go/libraries/doltcore/merge/resolve.go b/go/libraries/doltcore/merge/resolve.go index 061f3ae54c..a684ddcac6 100644 --- a/go/libraries/doltcore/merge/resolve.go +++ b/go/libraries/doltcore/merge/resolve.go @@ -18,11 +18,11 @@ import ( "context" "fmt" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema/encoding" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema/encoding" + "github.com/dolthub/dolt/go/libraries/doltcore/table" + "github.com/dolthub/dolt/go/store/types" ) type AutoResolver func(key types.Value, conflict doltdb.Conflict) (types.Value, error) diff --git a/go/libraries/doltcore/mvdata/data_loc.go b/go/libraries/doltcore/mvdata/data_loc.go index 511e2df661..830a226516 100644 --- a/go/libraries/doltcore/mvdata/data_loc.go +++ b/go/libraries/doltcore/mvdata/data_loc.go @@ -22,11 +22,11 @@ import ( "path/filepath" "strings" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/typed/noms" - "github.com/liquidata-inc/dolt/go/libraries/utils/filesys" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/table" + "github.com/dolthub/dolt/go/libraries/doltcore/table/typed/noms" + "github.com/dolthub/dolt/go/libraries/utils/filesys" ) var InStream io.ReadCloser = os.Stdin diff --git a/go/libraries/doltcore/mvdata/data_loc_test.go b/go/libraries/doltcore/mvdata/data_loc_test.go index 66290f14d0..bb8b9782d5 100644 --- a/go/libraries/doltcore/mvdata/data_loc_test.go +++ b/go/libraries/doltcore/mvdata/data_loc_test.go @@ -22,16 +22,16 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema/encoding" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/typed/json" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/typed/noms" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/untyped/csv" - "github.com/liquidata-inc/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/schema/encoding" + "github.com/dolthub/dolt/go/libraries/doltcore/table" + "github.com/dolthub/dolt/go/libraries/doltcore/table/typed/json" + "github.com/dolthub/dolt/go/libraries/doltcore/table/typed/noms" + "github.com/dolthub/dolt/go/libraries/doltcore/table/untyped/csv" + "github.com/dolthub/dolt/go/libraries/utils/filesys" + "github.com/dolthub/dolt/go/store/types" ) const ( diff --git a/go/libraries/doltcore/mvdata/data_mover.go b/go/libraries/doltcore/mvdata/data_mover.go index 8f3316069c..0dd79aec60 100644 --- a/go/libraries/doltcore/mvdata/data_mover.go +++ b/go/libraries/doltcore/mvdata/data_mover.go @@ -20,17 +20,17 @@ import ( "fmt" "sync/atomic" - sqleSchema "github.com/liquidata-inc/dolt/go/libraries/doltcore/sqle/schema" + sqleSchema "github.com/dolthub/dolt/go/libraries/doltcore/sqle/schema" - "github.com/liquidata-inc/dolt/go/cmd/dolt/errhand" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/rowconv" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/pipeline" - "github.com/liquidata-inc/dolt/go/libraries/utils/filesys" + "github.com/dolthub/dolt/go/cmd/dolt/errhand" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/env" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/rowconv" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/table" + "github.com/dolthub/dolt/go/libraries/doltcore/table/pipeline" + "github.com/dolthub/dolt/go/libraries/utils/filesys" ) type CsvOptions struct { diff --git a/go/libraries/doltcore/mvdata/file_data_loc.go b/go/libraries/doltcore/mvdata/file_data_loc.go index 52982d14cd..3be908e723 100644 --- a/go/libraries/doltcore/mvdata/file_data_loc.go +++ b/go/libraries/doltcore/mvdata/file_data_loc.go @@ -21,15 +21,15 @@ import ( "os" "strings" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/typed/json" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/typed/noms" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/untyped/csv" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/untyped/sqlexport" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/untyped/xlsx" - "github.com/liquidata-inc/dolt/go/libraries/utils/filesys" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/table" + "github.com/dolthub/dolt/go/libraries/doltcore/table/typed/json" + "github.com/dolthub/dolt/go/libraries/doltcore/table/typed/noms" + "github.com/dolthub/dolt/go/libraries/doltcore/table/untyped/csv" + "github.com/dolthub/dolt/go/libraries/doltcore/table/untyped/sqlexport" + "github.com/dolthub/dolt/go/libraries/doltcore/table/untyped/xlsx" + "github.com/dolthub/dolt/go/libraries/utils/filesys" ) // DFFromString returns a data object from a string. diff --git a/go/libraries/doltcore/mvdata/stream_data_loc.go b/go/libraries/doltcore/mvdata/stream_data_loc.go index 605b48c423..0f7e47c412 100644 --- a/go/libraries/doltcore/mvdata/stream_data_loc.go +++ b/go/libraries/doltcore/mvdata/stream_data_loc.go @@ -20,13 +20,13 @@ import ( "io" "io/ioutil" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/typed/noms" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/untyped/csv" - "github.com/liquidata-inc/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/dolt/go/libraries/utils/iohelp" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/table" + "github.com/dolthub/dolt/go/libraries/doltcore/table/typed/noms" + "github.com/dolthub/dolt/go/libraries/doltcore/table/untyped/csv" + "github.com/dolthub/dolt/go/libraries/utils/filesys" + "github.com/dolthub/dolt/go/libraries/utils/iohelp" ) // StreamDataLocation is a process stream that that can be imported from or exported to. diff --git a/go/libraries/doltcore/mvdata/table_data_loc.go b/go/libraries/doltcore/mvdata/table_data_loc.go index 55a7fdc661..3ae850ba66 100644 --- a/go/libraries/doltcore/mvdata/table_data_loc.go +++ b/go/libraries/doltcore/mvdata/table_data_loc.go @@ -19,15 +19,15 @@ import ( "errors" "sync/atomic" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema/encoding" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema/encoding" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/typed/noms" - "github.com/liquidata-inc/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/table" + "github.com/dolthub/dolt/go/libraries/doltcore/table/typed/noms" + "github.com/dolthub/dolt/go/libraries/utils/filesys" + "github.com/dolthub/dolt/go/store/types" ) // TableDataLocationUpdateRate is the number of writes that will process before the updated stats are displayed. diff --git a/go/libraries/doltcore/rebase/rebase.go b/go/libraries/doltcore/rebase/rebase.go index 1c76efcbb9..1c7599a7e3 100644 --- a/go/libraries/doltcore/rebase/rebase.go +++ b/go/libraries/doltcore/rebase/rebase.go @@ -18,8 +18,8 @@ import ( "context" "fmt" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/store/hash" ) type visitedSet map[hash.Hash]*doltdb.Commit diff --git a/go/libraries/doltcore/rebase/rebase_tag.go b/go/libraries/doltcore/rebase/rebase_tag.go index 3d8301928f..275a7a7c72 100644 --- a/go/libraries/doltcore/rebase/rebase_tag.go +++ b/go/libraries/doltcore/rebase/rebase_tag.go @@ -19,18 +19,18 @@ import ( "fmt" "time" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/diff" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/ref" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema/encoding" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/typed/noms" - "github.com/liquidata-inc/dolt/go/libraries/utils/set" - ndiff "github.com/liquidata-inc/dolt/go/store/diff" - "github.com/liquidata-inc/dolt/go/store/hash" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/diff" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/env" + "github.com/dolthub/dolt/go/libraries/doltcore/ref" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/schema/encoding" + "github.com/dolthub/dolt/go/libraries/doltcore/table/typed/noms" + "github.com/dolthub/dolt/go/libraries/utils/set" + ndiff "github.com/dolthub/dolt/go/store/diff" + "github.com/dolthub/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/types" ) const diffBufSize = 4096 diff --git a/go/libraries/doltcore/ref/ref_spec.go b/go/libraries/doltcore/ref/ref_spec.go index 7895e3df79..e3d37ec851 100644 --- a/go/libraries/doltcore/ref/ref_spec.go +++ b/go/libraries/doltcore/ref/ref_spec.go @@ -18,7 +18,7 @@ import ( "errors" "strings" - "github.com/liquidata-inc/dolt/go/libraries/utils/strhelp" + "github.com/dolthub/dolt/go/libraries/utils/strhelp" ) // ErrInvalidRefSpec is the error returned when a refspec isn't syntactically valid diff --git a/go/libraries/doltcore/ref/remote_ref.go b/go/libraries/doltcore/ref/remote_ref.go index 9deec0ac22..5b351f1d9c 100644 --- a/go/libraries/doltcore/ref/remote_ref.go +++ b/go/libraries/doltcore/ref/remote_ref.go @@ -18,7 +18,7 @@ import ( "path" "strings" - "github.com/liquidata-inc/dolt/go/libraries/utils/strhelp" + "github.com/dolthub/dolt/go/libraries/utils/strhelp" ) // RemoteRef is a reference to a reference that tracks a branch on a remote diff --git a/go/libraries/doltcore/remotestorage/chunk_cache.go b/go/libraries/doltcore/remotestorage/chunk_cache.go index c7635edf8d..a93f1dbebf 100644 --- a/go/libraries/doltcore/remotestorage/chunk_cache.go +++ b/go/libraries/doltcore/remotestorage/chunk_cache.go @@ -15,8 +15,8 @@ package remotestorage import ( - "github.com/liquidata-inc/dolt/go/store/hash" - "github.com/liquidata-inc/dolt/go/store/nbs" + "github.com/dolthub/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/nbs" ) // chunkCache is an interface used for caching chunks diff --git a/go/libraries/doltcore/remotestorage/chunk_store.go b/go/libraries/doltcore/remotestorage/chunk_store.go index fec4456cba..c17a8d4a55 100644 --- a/go/libraries/doltcore/remotestorage/chunk_store.go +++ b/go/libraries/doltcore/remotestorage/chunk_store.go @@ -31,13 +31,13 @@ import ( "github.com/cenkalti/backoff" - remotesapi "github.com/liquidata-inc/dolt/go/gen/proto/dolt/services/remotesapi/v1alpha1" - "github.com/liquidata-inc/dolt/go/libraries/utils/iohelp" - "github.com/liquidata-inc/dolt/go/store/atomicerr" - "github.com/liquidata-inc/dolt/go/store/chunks" - "github.com/liquidata-inc/dolt/go/store/hash" - "github.com/liquidata-inc/dolt/go/store/nbs" - "github.com/liquidata-inc/dolt/go/store/types" + remotesapi "github.com/dolthub/dolt/go/gen/proto/dolt/services/remotesapi/v1alpha1" + "github.com/dolthub/dolt/go/libraries/utils/iohelp" + "github.com/dolthub/dolt/go/store/atomicerr" + "github.com/dolthub/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/nbs" + "github.com/dolthub/dolt/go/store/types" ) var ErrUploadFailed = errors.New("upload failed") diff --git a/go/libraries/doltcore/remotestorage/events_interceptor.go b/go/libraries/doltcore/remotestorage/events_interceptor.go index 35be8b873b..6010a3ddfc 100644 --- a/go/libraries/doltcore/remotestorage/events_interceptor.go +++ b/go/libraries/doltcore/remotestorage/events_interceptor.go @@ -19,8 +19,8 @@ import ( "google.golang.org/grpc" - eventsapi "github.com/liquidata-inc/dolt/go/gen/proto/dolt/services/eventsapi/v1alpha1" - "github.com/liquidata-inc/dolt/go/libraries/events" + eventsapi "github.com/dolthub/dolt/go/gen/proto/dolt/services/eventsapi/v1alpha1" + "github.com/dolthub/dolt/go/libraries/events" ) func EventsUnaryClientInterceptor(collector *events.Collector) grpc.UnaryClientInterceptor { diff --git a/go/libraries/doltcore/remotestorage/map_chunk_cache.go b/go/libraries/doltcore/remotestorage/map_chunk_cache.go index 4808a61389..7714e90adf 100644 --- a/go/libraries/doltcore/remotestorage/map_chunk_cache.go +++ b/go/libraries/doltcore/remotestorage/map_chunk_cache.go @@ -17,8 +17,8 @@ package remotestorage import ( "sync" - "github.com/liquidata-inc/dolt/go/store/hash" - "github.com/liquidata-inc/dolt/go/store/nbs" + "github.com/dolthub/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/nbs" ) // mapChunkCache is a ChunkCache implementation that stores everything in an in memory map. diff --git a/go/libraries/doltcore/remotestorage/map_chunk_cache_test.go b/go/libraries/doltcore/remotestorage/map_chunk_cache_test.go index 2e5e174a49..cd813e0cdb 100644 --- a/go/libraries/doltcore/remotestorage/map_chunk_cache_test.go +++ b/go/libraries/doltcore/remotestorage/map_chunk_cache_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/store/chunks" - "github.com/liquidata-inc/dolt/go/store/hash" - "github.com/liquidata-inc/dolt/go/store/nbs" + "github.com/dolthub/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/nbs" ) func genRandomChunks(rng *rand.Rand, n int) (hash.HashSet, []nbs.CompressedChunk) { diff --git a/go/libraries/doltcore/remotestorage/noop_chunk_cache.go b/go/libraries/doltcore/remotestorage/noop_chunk_cache.go index bad826913e..db58e09cf4 100644 --- a/go/libraries/doltcore/remotestorage/noop_chunk_cache.go +++ b/go/libraries/doltcore/remotestorage/noop_chunk_cache.go @@ -15,8 +15,8 @@ package remotestorage import ( - "github.com/liquidata-inc/dolt/go/store/hash" - "github.com/liquidata-inc/dolt/go/store/nbs" + "github.com/dolthub/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/nbs" ) // noopChunkCache is a ChunkCache implementation that stores nothing diff --git a/go/libraries/doltcore/remotestorage/utils.go b/go/libraries/doltcore/remotestorage/utils.go index 5178fc680f..fec73ac650 100644 --- a/go/libraries/doltcore/remotestorage/utils.go +++ b/go/libraries/doltcore/remotestorage/utils.go @@ -14,7 +14,7 @@ package remotestorage -import "github.com/liquidata-inc/dolt/go/store/hash" +import "github.com/dolthub/dolt/go/store/hash" // HashesToSlices takes a list of hashes and converts each hash to a byte slice returning a slice of byte slices func HashesToSlices(hashes []hash.Hash) [][]byte { diff --git a/go/libraries/doltcore/remotestorage/utils_test.go b/go/libraries/doltcore/remotestorage/utils_test.go index fb86f8a2e2..e7906a7fb5 100644 --- a/go/libraries/doltcore/remotestorage/utils_test.go +++ b/go/libraries/doltcore/remotestorage/utils_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/hash" ) func TestHashesToSlices(t *testing.T) { diff --git a/go/libraries/doltcore/row/fmt.go b/go/libraries/doltcore/row/fmt.go index f0e375d20c..9d030f50af 100644 --- a/go/libraries/doltcore/row/fmt.go +++ b/go/libraries/doltcore/row/fmt.go @@ -18,8 +18,8 @@ import ( "bytes" "context" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/store/types" ) type RowFormatFunc func(ctx context.Context, r Row, sch schema.Schema) string diff --git a/go/libraries/doltcore/row/noms_row.go b/go/libraries/doltcore/row/noms_row.go index e3d64787cf..7908ce419a 100644 --- a/go/libraries/doltcore/row/noms_row.go +++ b/go/libraries/doltcore/row/noms_row.go @@ -17,8 +17,8 @@ package row import ( "errors" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/store/types" ) type nomsRow struct { diff --git a/go/libraries/doltcore/row/noms_row_test.go b/go/libraries/doltcore/row/noms_row_test.go index 3bd15e9ea7..1e5cfd315a 100644 --- a/go/libraries/doltcore/row/noms_row_test.go +++ b/go/libraries/doltcore/row/noms_row_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema/typeinfo" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/schema/typeinfo" + "github.com/dolthub/dolt/go/store/types" ) const ( diff --git a/go/libraries/doltcore/row/row.go b/go/libraries/doltcore/row/row.go index 80a0fff0c6..06fdad9163 100644 --- a/go/libraries/doltcore/row/row.go +++ b/go/libraries/doltcore/row/row.go @@ -18,9 +18,9 @@ import ( "errors" "fmt" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/utils/valutil" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/utils/valutil" + "github.com/dolthub/dolt/go/store/types" ) var ErrRowNotValid = errors.New("invalid row for current schema") diff --git a/go/libraries/doltcore/row/row_test.go b/go/libraries/doltcore/row/row_test.go index b6545025ce..aa886c8a2d 100644 --- a/go/libraries/doltcore/row/row_test.go +++ b/go/libraries/doltcore/row/row_test.go @@ -20,8 +20,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/store/types" ) func TestGetFieldByName(t *testing.T) { diff --git a/go/libraries/doltcore/row/tagged_values.go b/go/libraries/doltcore/row/tagged_values.go index 45c93ee66f..e7354af21e 100644 --- a/go/libraries/doltcore/row/tagged_values.go +++ b/go/libraries/doltcore/row/tagged_values.go @@ -18,8 +18,8 @@ import ( "context" "fmt" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/store/types" ) type TaggedValues map[uint64]types.Value diff --git a/go/libraries/doltcore/row/tagged_values_test.go b/go/libraries/doltcore/row/tagged_values_test.go index a14b479fbd..92a207e87b 100644 --- a/go/libraries/doltcore/row/tagged_values_test.go +++ b/go/libraries/doltcore/row/tagged_values_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) func TestTupleValsLess(t *testing.T) { diff --git a/go/libraries/doltcore/rowconv/field_mapping.go b/go/libraries/doltcore/rowconv/field_mapping.go index 4e1b26c88f..b44672138c 100644 --- a/go/libraries/doltcore/rowconv/field_mapping.go +++ b/go/libraries/doltcore/rowconv/field_mapping.go @@ -19,11 +19,11 @@ import ( "fmt" "strconv" - "github.com/liquidata-inc/dolt/go/cmd/dolt/errhand" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/untyped" - "github.com/liquidata-inc/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/dolt/go/libraries/utils/set" + "github.com/dolthub/dolt/go/cmd/dolt/errhand" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/table/untyped" + "github.com/dolthub/dolt/go/libraries/utils/filesys" + "github.com/dolthub/dolt/go/libraries/utils/set" ) // ErrMappingFileRead is an error returned when a mapping file cannot be read diff --git a/go/libraries/doltcore/rowconv/field_mapping_test.go b/go/libraries/doltcore/rowconv/field_mapping_test.go index c092137490..6c812320f4 100644 --- a/go/libraries/doltcore/rowconv/field_mapping_test.go +++ b/go/libraries/doltcore/rowconv/field_mapping_test.go @@ -18,9 +18,9 @@ import ( "reflect" "testing" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/utils/filesys" + "github.com/dolthub/dolt/go/store/types" ) var fieldsA, _ = schema.NewColCollection( diff --git a/go/libraries/doltcore/rowconv/joiner.go b/go/libraries/doltcore/rowconv/joiner.go index 5731fad95d..f04c36f088 100644 --- a/go/libraries/doltcore/rowconv/joiner.go +++ b/go/libraries/doltcore/rowconv/joiner.go @@ -17,9 +17,9 @@ package rowconv import ( "errors" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/store/types" ) // ColNamingFunc defines a function signature which takes the name of a column, and returns the name that should be used diff --git a/go/libraries/doltcore/rowconv/joiner_test.go b/go/libraries/doltcore/rowconv/joiner_test.go index ba2ae81fa2..6d11cfe4f5 100644 --- a/go/libraries/doltcore/rowconv/joiner_test.go +++ b/go/libraries/doltcore/rowconv/joiner_test.go @@ -19,9 +19,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/store/types" ) const ( diff --git a/go/libraries/doltcore/rowconv/row_converter.go b/go/libraries/doltcore/rowconv/row_converter.go index bf9f5d39b1..563cf6a0fa 100644 --- a/go/libraries/doltcore/rowconv/row_converter.go +++ b/go/libraries/doltcore/rowconv/row_converter.go @@ -17,11 +17,11 @@ package rowconv import ( "fmt" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema/typeinfo" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/pipeline" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/schema/typeinfo" + "github.com/dolthub/dolt/go/libraries/doltcore/table/pipeline" + "github.com/dolthub/dolt/go/store/types" ) var IdentityConverter = &RowConverter{nil, true, nil} diff --git a/go/libraries/doltcore/rowconv/row_converter_test.go b/go/libraries/doltcore/rowconv/row_converter_test.go index d45e73ceaf..108bfbca9e 100644 --- a/go/libraries/doltcore/rowconv/row_converter_test.go +++ b/go/libraries/doltcore/rowconv/row_converter_test.go @@ -23,12 +23,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema/typeinfo" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/pipeline" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/untyped" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/schema/typeinfo" + "github.com/dolthub/dolt/go/libraries/doltcore/table/pipeline" + "github.com/dolthub/dolt/go/libraries/doltcore/table/untyped" + "github.com/dolthub/dolt/go/store/types" ) var srcCols, _ = schema.NewColCollection( diff --git a/go/libraries/doltcore/schema/alterschema/addcolumn.go b/go/libraries/doltcore/schema/alterschema/addcolumn.go index 5616390821..734b622df8 100644 --- a/go/libraries/doltcore/schema/alterschema/addcolumn.go +++ b/go/libraries/doltcore/schema/alterschema/addcolumn.go @@ -18,12 +18,12 @@ import ( "context" "fmt" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema/encoding" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema/typeinfo" - sqleSchema "github.com/liquidata-inc/dolt/go/libraries/doltcore/sqle/schema" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/schema/encoding" + "github.com/dolthub/dolt/go/libraries/doltcore/schema/typeinfo" + sqleSchema "github.com/dolthub/dolt/go/libraries/doltcore/sqle/schema" + "github.com/dolthub/dolt/go/store/types" ) // Nullable represents whether a column can have a null value. diff --git a/go/libraries/doltcore/schema/alterschema/addcolumn_test.go b/go/libraries/doltcore/schema/alterschema/addcolumn_test.go index d5b269a2ef..99105ec791 100644 --- a/go/libraries/doltcore/schema/alterschema/addcolumn_test.go +++ b/go/libraries/doltcore/schema/alterschema/addcolumn_test.go @@ -23,14 +23,14 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/dtestutils" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema/typeinfo" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/typed/noms" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/dtestutils" + "github.com/dolthub/dolt/go/libraries/doltcore/env" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/schema/typeinfo" + "github.com/dolthub/dolt/go/libraries/doltcore/table" + "github.com/dolthub/dolt/go/libraries/doltcore/table/typed/noms" + "github.com/dolthub/dolt/go/store/types" ) const tableName = "people" diff --git a/go/libraries/doltcore/schema/alterschema/dropcolumn.go b/go/libraries/doltcore/schema/alterschema/dropcolumn.go index 70b335cead..ea6319e2c5 100644 --- a/go/libraries/doltcore/schema/alterschema/dropcolumn.go +++ b/go/libraries/doltcore/schema/alterschema/dropcolumn.go @@ -19,11 +19,11 @@ import ( "errors" "fmt" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema/encoding" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/schema/encoding" + "github.com/dolthub/dolt/go/store/types" ) // DropColumn drops a column from a table, and removes its associated cell values diff --git a/go/libraries/doltcore/schema/alterschema/dropcolumn_test.go b/go/libraries/doltcore/schema/alterschema/dropcolumn_test.go index af116aaf13..345c632650 100644 --- a/go/libraries/doltcore/schema/alterschema/dropcolumn_test.go +++ b/go/libraries/doltcore/schema/alterschema/dropcolumn_test.go @@ -21,10 +21,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/dtestutils" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/dtestutils" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/store/types" ) var TypedRowsWithoutAge []row.Row diff --git a/go/libraries/doltcore/schema/alterschema/modifycolumn.go b/go/libraries/doltcore/schema/alterschema/modifycolumn.go index 5c98a0d3cf..6c1fbf6c52 100644 --- a/go/libraries/doltcore/schema/alterschema/modifycolumn.go +++ b/go/libraries/doltcore/schema/alterschema/modifycolumn.go @@ -19,11 +19,11 @@ import ( "errors" "fmt" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema/encoding" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/schema/encoding" + "github.com/dolthub/dolt/go/store/types" ) // ModifyColumn modifies the column with the name given, replacing it with the new definition provided. A column with diff --git a/go/libraries/doltcore/schema/alterschema/modifycolumn_test.go b/go/libraries/doltcore/schema/alterschema/modifycolumn_test.go index 6f909286ec..a210322d79 100644 --- a/go/libraries/doltcore/schema/alterschema/modifycolumn_test.go +++ b/go/libraries/doltcore/schema/alterschema/modifycolumn_test.go @@ -21,10 +21,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/dtestutils" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/dtestutils" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/store/types" ) func TestModifyColumn(t *testing.T) { diff --git a/go/libraries/doltcore/schema/alterschema/renametable.go b/go/libraries/doltcore/schema/alterschema/renametable.go index f49a461cfa..91829e09ee 100644 --- a/go/libraries/doltcore/schema/alterschema/renametable.go +++ b/go/libraries/doltcore/schema/alterschema/renametable.go @@ -17,7 +17,7 @@ package alterschema import ( "context" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" ) // RenameTable renames a table with in a RootValue and returns the updated root. diff --git a/go/libraries/doltcore/schema/alterschema/renametable_test.go b/go/libraries/doltcore/schema/alterschema/renametable_test.go index d5f70df6b6..678d527afd 100644 --- a/go/libraries/doltcore/schema/alterschema/renametable_test.go +++ b/go/libraries/doltcore/schema/alterschema/renametable_test.go @@ -21,11 +21,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/dtestutils" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/dtestutils" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/store/types" ) func TestRenameTable(t *testing.T) { diff --git a/go/libraries/doltcore/schema/col_coll_test.go b/go/libraries/doltcore/schema/col_coll_test.go index d820bbb1d0..e68f85e347 100644 --- a/go/libraries/doltcore/schema/col_coll_test.go +++ b/go/libraries/doltcore/schema/col_coll_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema/typeinfo" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/schema/typeinfo" + "github.com/dolthub/dolt/go/store/types" ) var firstNameCol = Column{"first", 0, types.StringKind, false, typeinfo.StringDefaultType, "", "", nil} diff --git a/go/libraries/doltcore/schema/column.go b/go/libraries/doltcore/schema/column.go index 071ce8a40d..fedc06b765 100644 --- a/go/libraries/doltcore/schema/column.go +++ b/go/libraries/doltcore/schema/column.go @@ -19,8 +19,8 @@ import ( "math" "strings" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema/typeinfo" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/schema/typeinfo" + "github.com/dolthub/dolt/go/store/types" ) // InvalidTag is used as an invalid tag diff --git a/go/libraries/doltcore/schema/constraint.go b/go/libraries/doltcore/schema/constraint.go index 07be94960f..2ff867f6fa 100644 --- a/go/libraries/doltcore/schema/constraint.go +++ b/go/libraries/doltcore/schema/constraint.go @@ -17,7 +17,7 @@ package schema import ( "fmt" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) // ColConstraint is an interface used for evaluating whether a columns value is valid diff --git a/go/libraries/doltcore/schema/constraint_test.go b/go/libraries/doltcore/schema/constraint_test.go index 44091ae331..09a00817d7 100644 --- a/go/libraries/doltcore/schema/constraint_test.go +++ b/go/libraries/doltcore/schema/constraint_test.go @@ -17,7 +17,7 @@ package schema import ( "testing" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) type TestConstraint struct { diff --git a/go/libraries/doltcore/schema/encoding/schema_marshaling.go b/go/libraries/doltcore/schema/encoding/schema_marshaling.go index 2b3b81a524..e4de8e609a 100644 --- a/go/libraries/doltcore/schema/encoding/schema_marshaling.go +++ b/go/libraries/doltcore/schema/encoding/schema_marshaling.go @@ -18,10 +18,10 @@ import ( "context" "errors" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema/typeinfo" - "github.com/liquidata-inc/dolt/go/store/marshal" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/schema/typeinfo" + "github.com/dolthub/dolt/go/store/marshal" + "github.com/dolthub/dolt/go/store/types" ) // Correct Marshalling & Unmarshalling is essential to compatibility across Dolt versions diff --git a/go/libraries/doltcore/schema/encoding/schema_marshaling_test.go b/go/libraries/doltcore/schema/encoding/schema_marshaling_test.go index 36fec378b4..41f7658a83 100644 --- a/go/libraries/doltcore/schema/encoding/schema_marshaling_test.go +++ b/go/libraries/doltcore/schema/encoding/schema_marshaling_test.go @@ -20,17 +20,17 @@ import ( "reflect" "testing" - "github.com/liquidata-inc/go-mysql-server/sql" - "github.com/liquidata-inc/vitess/go/sqltypes" + "github.com/dolthub/go-mysql-server/sql" + "github.com/dolthub/vitess/go/sqltypes" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/dbfactory" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema/typeinfo" - "github.com/liquidata-inc/dolt/go/store/constants" - "github.com/liquidata-inc/dolt/go/store/marshal" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/dbfactory" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/schema/typeinfo" + "github.com/dolthub/dolt/go/store/constants" + "github.com/dolthub/dolt/go/store/marshal" + "github.com/dolthub/dolt/go/store/types" ) func createTestSchema() schema.Schema { diff --git a/go/libraries/doltcore/schema/index_test.go b/go/libraries/doltcore/schema/index_test.go index b79d1f4dd0..e2c85c9ff4 100644 --- a/go/libraries/doltcore/schema/index_test.go +++ b/go/libraries/doltcore/schema/index_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) func TestIndexCollectionAddIndex(t *testing.T) { diff --git a/go/libraries/doltcore/schema/schema_test.go b/go/libraries/doltcore/schema/schema_test.go index e0639d1a9c..274ddc4716 100644 --- a/go/libraries/doltcore/schema/schema_test.go +++ b/go/libraries/doltcore/schema/schema_test.go @@ -21,8 +21,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema/typeinfo" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/schema/typeinfo" + "github.com/dolthub/dolt/go/store/types" ) const ( diff --git a/go/libraries/doltcore/schema/super_schema.go b/go/libraries/doltcore/schema/super_schema.go index d64803f407..e6fc558cd6 100644 --- a/go/libraries/doltcore/schema/super_schema.go +++ b/go/libraries/doltcore/schema/super_schema.go @@ -18,7 +18,7 @@ import ( "errors" "fmt" - "github.com/liquidata-inc/dolt/go/libraries/utils/set" + "github.com/dolthub/dolt/go/libraries/utils/set" ) // SuperSchema is the union of all Schemas over the history of a table diff --git a/go/libraries/doltcore/schema/super_schema_test.go b/go/libraries/doltcore/schema/super_schema_test.go index 1d94b999ac..23bd99bfcd 100644 --- a/go/libraries/doltcore/schema/super_schema_test.go +++ b/go/libraries/doltcore/schema/super_schema_test.go @@ -20,8 +20,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema/typeinfo" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/schema/typeinfo" + "github.com/dolthub/dolt/go/store/types" ) var sch1 = mustSchema([]Column{ diff --git a/go/libraries/doltcore/schema/tag.go b/go/libraries/doltcore/schema/tag.go index dadcbf3660..5d616edc22 100644 --- a/go/libraries/doltcore/schema/tag.go +++ b/go/libraries/doltcore/schema/tag.go @@ -22,8 +22,8 @@ import ( "regexp" "strings" - "github.com/liquidata-inc/dolt/go/libraries/utils/set" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/utils/set" + "github.com/dolthub/dolt/go/store/types" ) const ( diff --git a/go/libraries/doltcore/schema/typeinfo/bit.go b/go/libraries/doltcore/schema/typeinfo/bit.go index d48ac4a0f7..cf7cd53e34 100644 --- a/go/libraries/doltcore/schema/typeinfo/bit.go +++ b/go/libraries/doltcore/schema/typeinfo/bit.go @@ -18,9 +18,9 @@ import ( "fmt" "strconv" - "github.com/liquidata-inc/go-mysql-server/sql" + "github.com/dolthub/go-mysql-server/sql" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) const ( diff --git a/go/libraries/doltcore/schema/typeinfo/bit_test.go b/go/libraries/doltcore/schema/typeinfo/bit_test.go index 8174841640..c66a6dce60 100644 --- a/go/libraries/doltcore/schema/typeinfo/bit_test.go +++ b/go/libraries/doltcore/schema/typeinfo/bit_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) func TestBitConvertNomsValueToValue(t *testing.T) { diff --git a/go/libraries/doltcore/schema/typeinfo/bool.go b/go/libraries/doltcore/schema/typeinfo/bool.go index 061eeeb7f1..f3430a42a4 100644 --- a/go/libraries/doltcore/schema/typeinfo/bool.go +++ b/go/libraries/doltcore/schema/typeinfo/bool.go @@ -19,9 +19,9 @@ import ( "math" "strconv" - "github.com/liquidata-inc/go-mysql-server/sql" + "github.com/dolthub/go-mysql-server/sql" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) type boolType struct { diff --git a/go/libraries/doltcore/schema/typeinfo/bool_test.go b/go/libraries/doltcore/schema/typeinfo/bool_test.go index c2bf21570e..e09b2f8e13 100644 --- a/go/libraries/doltcore/schema/typeinfo/bool_test.go +++ b/go/libraries/doltcore/schema/typeinfo/bool_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) func TestBoolConvertNomsValueToValue(t *testing.T) { diff --git a/go/libraries/doltcore/schema/typeinfo/common_test.go b/go/libraries/doltcore/schema/typeinfo/common_test.go index cb22f0f391..8631ef8c1a 100644 --- a/go/libraries/doltcore/schema/typeinfo/common_test.go +++ b/go/libraries/doltcore/schema/typeinfo/common_test.go @@ -19,11 +19,11 @@ import ( "strconv" "testing" - "github.com/liquidata-inc/go-mysql-server/sql" - "github.com/liquidata-inc/vitess/go/sqltypes" + "github.com/dolthub/go-mysql-server/sql" + "github.com/dolthub/vitess/go/sqltypes" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/libraries/utils/mathutil" + "github.com/dolthub/dolt/go/libraries/utils/mathutil" ) func generateBitTypes(t *testing.T, numOfTypes uint16) []TypeInfo { diff --git a/go/libraries/doltcore/schema/typeinfo/datetime.go b/go/libraries/doltcore/schema/typeinfo/datetime.go index 8ada9289dd..1c5041d27d 100644 --- a/go/libraries/doltcore/schema/typeinfo/datetime.go +++ b/go/libraries/doltcore/schema/typeinfo/datetime.go @@ -18,10 +18,10 @@ import ( "fmt" "time" - "github.com/liquidata-inc/go-mysql-server/sql" - "github.com/liquidata-inc/vitess/go/sqltypes" + "github.com/dolthub/go-mysql-server/sql" + "github.com/dolthub/vitess/go/sqltypes" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) const ( diff --git a/go/libraries/doltcore/schema/typeinfo/datetime_test.go b/go/libraries/doltcore/schema/typeinfo/datetime_test.go index 95bc8da544..4020564620 100644 --- a/go/libraries/doltcore/schema/typeinfo/datetime_test.go +++ b/go/libraries/doltcore/schema/typeinfo/datetime_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) func TestDatetimeConvertNomsValueToValue(t *testing.T) { diff --git a/go/libraries/doltcore/schema/typeinfo/decimal.go b/go/libraries/doltcore/schema/typeinfo/decimal.go index 827675698d..339177fe92 100644 --- a/go/libraries/doltcore/schema/typeinfo/decimal.go +++ b/go/libraries/doltcore/schema/typeinfo/decimal.go @@ -18,10 +18,10 @@ import ( "fmt" "strconv" - "github.com/liquidata-inc/go-mysql-server/sql" + "github.com/dolthub/go-mysql-server/sql" "github.com/shopspring/decimal" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) const ( diff --git a/go/libraries/doltcore/schema/typeinfo/decimal_test.go b/go/libraries/doltcore/schema/typeinfo/decimal_test.go index f280113b06..3bb19cd5fb 100644 --- a/go/libraries/doltcore/schema/typeinfo/decimal_test.go +++ b/go/libraries/doltcore/schema/typeinfo/decimal_test.go @@ -20,12 +20,12 @@ import ( "testing" "time" - "github.com/liquidata-inc/go-mysql-server/sql" + "github.com/dolthub/go-mysql-server/sql" "github.com/shopspring/decimal" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) func TestDecimalConvertNomsValueToValue(t *testing.T) { diff --git a/go/libraries/doltcore/schema/typeinfo/enum.go b/go/libraries/doltcore/schema/typeinfo/enum.go index a60bfa8b56..4b6a47c335 100644 --- a/go/libraries/doltcore/schema/typeinfo/enum.go +++ b/go/libraries/doltcore/schema/typeinfo/enum.go @@ -19,9 +19,9 @@ import ( "fmt" "strings" - "github.com/liquidata-inc/go-mysql-server/sql" + "github.com/dolthub/go-mysql-server/sql" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) const ( diff --git a/go/libraries/doltcore/schema/typeinfo/enum_test.go b/go/libraries/doltcore/schema/typeinfo/enum_test.go index 264ad85cf6..6451a7df35 100644 --- a/go/libraries/doltcore/schema/typeinfo/enum_test.go +++ b/go/libraries/doltcore/schema/typeinfo/enum_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) func TestEnumConvertNomsValueToValue(t *testing.T) { diff --git a/go/libraries/doltcore/schema/typeinfo/float.go b/go/libraries/doltcore/schema/typeinfo/float.go index 23a80ae179..a6f1c19f17 100644 --- a/go/libraries/doltcore/schema/typeinfo/float.go +++ b/go/libraries/doltcore/schema/typeinfo/float.go @@ -18,10 +18,10 @@ import ( "fmt" "strconv" - "github.com/liquidata-inc/go-mysql-server/sql" - "github.com/liquidata-inc/vitess/go/sqltypes" + "github.com/dolthub/go-mysql-server/sql" + "github.com/dolthub/vitess/go/sqltypes" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) type FloatWidth int8 diff --git a/go/libraries/doltcore/schema/typeinfo/float_test.go b/go/libraries/doltcore/schema/typeinfo/float_test.go index b2bb0f3264..609e6c81d0 100644 --- a/go/libraries/doltcore/schema/typeinfo/float_test.go +++ b/go/libraries/doltcore/schema/typeinfo/float_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) func TestFloatConvertNomsValueToValue(t *testing.T) { diff --git a/go/libraries/doltcore/schema/typeinfo/inlineblob.go b/go/libraries/doltcore/schema/typeinfo/inlineblob.go index f98793c36b..fecbb58ca7 100644 --- a/go/libraries/doltcore/schema/typeinfo/inlineblob.go +++ b/go/libraries/doltcore/schema/typeinfo/inlineblob.go @@ -18,10 +18,10 @@ import ( "fmt" "math" - "github.com/liquidata-inc/go-mysql-server/sql" - "github.com/liquidata-inc/vitess/go/sqltypes" + "github.com/dolthub/go-mysql-server/sql" + "github.com/dolthub/vitess/go/sqltypes" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) type inlineBlobType struct { diff --git a/go/libraries/doltcore/schema/typeinfo/inlineblob_test.go b/go/libraries/doltcore/schema/typeinfo/inlineblob_test.go index de60c770a4..cc14e631cb 100644 --- a/go/libraries/doltcore/schema/typeinfo/inlineblob_test.go +++ b/go/libraries/doltcore/schema/typeinfo/inlineblob_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) func TestInlineBlobConvertNomsValueToValue(t *testing.T) { diff --git a/go/libraries/doltcore/schema/typeinfo/int.go b/go/libraries/doltcore/schema/typeinfo/int.go index 00fec395d0..01413262c5 100644 --- a/go/libraries/doltcore/schema/typeinfo/int.go +++ b/go/libraries/doltcore/schema/typeinfo/int.go @@ -18,10 +18,10 @@ import ( "fmt" "strconv" - "github.com/liquidata-inc/go-mysql-server/sql" - "github.com/liquidata-inc/vitess/go/sqltypes" + "github.com/dolthub/go-mysql-server/sql" + "github.com/dolthub/vitess/go/sqltypes" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) const ( diff --git a/go/libraries/doltcore/schema/typeinfo/int_test.go b/go/libraries/doltcore/schema/typeinfo/int_test.go index 5b8125bb86..1b4600f4e6 100644 --- a/go/libraries/doltcore/schema/typeinfo/int_test.go +++ b/go/libraries/doltcore/schema/typeinfo/int_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) func TestIntConvertNomsValueToValue(t *testing.T) { diff --git a/go/libraries/doltcore/schema/typeinfo/set.go b/go/libraries/doltcore/schema/typeinfo/set.go index b969dfdf55..d8c1f43086 100644 --- a/go/libraries/doltcore/schema/typeinfo/set.go +++ b/go/libraries/doltcore/schema/typeinfo/set.go @@ -19,9 +19,9 @@ import ( "fmt" "strings" - "github.com/liquidata-inc/go-mysql-server/sql" + "github.com/dolthub/go-mysql-server/sql" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) const ( diff --git a/go/libraries/doltcore/schema/typeinfo/set_test.go b/go/libraries/doltcore/schema/typeinfo/set_test.go index c7120675a1..cfdc67040f 100644 --- a/go/libraries/doltcore/schema/typeinfo/set_test.go +++ b/go/libraries/doltcore/schema/typeinfo/set_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) func TestSetConvertNomsValueToValue(t *testing.T) { diff --git a/go/libraries/doltcore/schema/typeinfo/time.go b/go/libraries/doltcore/schema/typeinfo/time.go index 375fcbbbee..b0ed7635d5 100644 --- a/go/libraries/doltcore/schema/typeinfo/time.go +++ b/go/libraries/doltcore/schema/typeinfo/time.go @@ -17,9 +17,9 @@ package typeinfo import ( "fmt" - "github.com/liquidata-inc/go-mysql-server/sql" + "github.com/dolthub/go-mysql-server/sql" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) // This is a dolt implementation of the MySQL type Time, thus most of the functionality diff --git a/go/libraries/doltcore/schema/typeinfo/time_test.go b/go/libraries/doltcore/schema/typeinfo/time_test.go index aba25146d2..eea5dcf650 100644 --- a/go/libraries/doltcore/schema/typeinfo/time_test.go +++ b/go/libraries/doltcore/schema/typeinfo/time_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) func TestTimeConvertNomsValueToValue(t *testing.T) { diff --git a/go/libraries/doltcore/schema/typeinfo/tuple.go b/go/libraries/doltcore/schema/typeinfo/tuple.go index 566b33bd04..a38234e096 100644 --- a/go/libraries/doltcore/schema/typeinfo/tuple.go +++ b/go/libraries/doltcore/schema/typeinfo/tuple.go @@ -17,9 +17,9 @@ package typeinfo import ( "fmt" - "github.com/liquidata-inc/go-mysql-server/sql" + "github.com/dolthub/go-mysql-server/sql" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) type tupleType struct{} diff --git a/go/libraries/doltcore/schema/typeinfo/typeinfo.go b/go/libraries/doltcore/schema/typeinfo/typeinfo.go index 5138d78de4..b2dd902f98 100644 --- a/go/libraries/doltcore/schema/typeinfo/typeinfo.go +++ b/go/libraries/doltcore/schema/typeinfo/typeinfo.go @@ -17,10 +17,10 @@ package typeinfo import ( "fmt" - "github.com/liquidata-inc/go-mysql-server/sql" - "github.com/liquidata-inc/vitess/go/sqltypes" + "github.com/dolthub/go-mysql-server/sql" + "github.com/dolthub/vitess/go/sqltypes" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) type Identifier string diff --git a/go/libraries/doltcore/schema/typeinfo/typeinfo_test.go b/go/libraries/doltcore/schema/typeinfo/typeinfo_test.go index c25064cbf3..af24007d07 100644 --- a/go/libraries/doltcore/schema/typeinfo/typeinfo_test.go +++ b/go/libraries/doltcore/schema/typeinfo/typeinfo_test.go @@ -19,12 +19,12 @@ import ( "testing" "time" - "github.com/liquidata-inc/go-mysql-server/sql" + "github.com/dolthub/go-mysql-server/sql" "github.com/shopspring/decimal" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) func TestTypeInfoSuite(t *testing.T) { diff --git a/go/libraries/doltcore/schema/typeinfo/uint.go b/go/libraries/doltcore/schema/typeinfo/uint.go index bee4a15927..124e5d449d 100644 --- a/go/libraries/doltcore/schema/typeinfo/uint.go +++ b/go/libraries/doltcore/schema/typeinfo/uint.go @@ -18,10 +18,10 @@ import ( "fmt" "strconv" - "github.com/liquidata-inc/go-mysql-server/sql" - "github.com/liquidata-inc/vitess/go/sqltypes" + "github.com/dolthub/go-mysql-server/sql" + "github.com/dolthub/vitess/go/sqltypes" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) const ( diff --git a/go/libraries/doltcore/schema/typeinfo/uint_test.go b/go/libraries/doltcore/schema/typeinfo/uint_test.go index 6014820fb8..ce5203bcd5 100644 --- a/go/libraries/doltcore/schema/typeinfo/uint_test.go +++ b/go/libraries/doltcore/schema/typeinfo/uint_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) func TestUintConvertNomsValueToValue(t *testing.T) { diff --git a/go/libraries/doltcore/schema/typeinfo/unknown.go b/go/libraries/doltcore/schema/typeinfo/unknown.go index 5b55412cd4..b42f5ee689 100644 --- a/go/libraries/doltcore/schema/typeinfo/unknown.go +++ b/go/libraries/doltcore/schema/typeinfo/unknown.go @@ -17,9 +17,9 @@ package typeinfo import ( "fmt" - "github.com/liquidata-inc/go-mysql-server/sql" + "github.com/dolthub/go-mysql-server/sql" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) type unknownImpl struct{} diff --git a/go/libraries/doltcore/schema/typeinfo/uuid.go b/go/libraries/doltcore/schema/typeinfo/uuid.go index 3bdd2a6067..b89a544bd9 100644 --- a/go/libraries/doltcore/schema/typeinfo/uuid.go +++ b/go/libraries/doltcore/schema/typeinfo/uuid.go @@ -17,11 +17,11 @@ package typeinfo import ( "fmt" + "github.com/dolthub/go-mysql-server/sql" + "github.com/dolthub/vitess/go/sqltypes" "github.com/google/uuid" - "github.com/liquidata-inc/go-mysql-server/sql" - "github.com/liquidata-inc/vitess/go/sqltypes" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) type uuidType struct { diff --git a/go/libraries/doltcore/schema/typeinfo/uuid_test.go b/go/libraries/doltcore/schema/typeinfo/uuid_test.go index 5999d1ab78..696ea7f343 100644 --- a/go/libraries/doltcore/schema/typeinfo/uuid_test.go +++ b/go/libraries/doltcore/schema/typeinfo/uuid_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) func TestUuidConvertNomsValueToValue(t *testing.T) { diff --git a/go/libraries/doltcore/schema/typeinfo/varbinary.go b/go/libraries/doltcore/schema/typeinfo/varbinary.go index 7627f9905e..bc1128e0a2 100644 --- a/go/libraries/doltcore/schema/typeinfo/varbinary.go +++ b/go/libraries/doltcore/schema/typeinfo/varbinary.go @@ -18,10 +18,10 @@ import ( "fmt" "strconv" - "github.com/liquidata-inc/go-mysql-server/sql" - "github.com/liquidata-inc/vitess/go/sqltypes" + "github.com/dolthub/go-mysql-server/sql" + "github.com/dolthub/vitess/go/sqltypes" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) const ( diff --git a/go/libraries/doltcore/schema/typeinfo/varstring.go b/go/libraries/doltcore/schema/typeinfo/varstring.go index 19ba1b8a75..a806ec278d 100644 --- a/go/libraries/doltcore/schema/typeinfo/varstring.go +++ b/go/libraries/doltcore/schema/typeinfo/varstring.go @@ -20,10 +20,10 @@ import ( "strings" "unicode" - "github.com/liquidata-inc/go-mysql-server/sql" - "github.com/liquidata-inc/vitess/go/sqltypes" + "github.com/dolthub/go-mysql-server/sql" + "github.com/dolthub/vitess/go/sqltypes" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) const ( diff --git a/go/libraries/doltcore/schema/typeinfo/varstring_test.go b/go/libraries/doltcore/schema/typeinfo/varstring_test.go index a7e2b9bcb8..4d028576c0 100644 --- a/go/libraries/doltcore/schema/typeinfo/varstring_test.go +++ b/go/libraries/doltcore/schema/typeinfo/varstring_test.go @@ -19,11 +19,11 @@ import ( "testing" "time" - "github.com/liquidata-inc/go-mysql-server/sql" + "github.com/dolthub/go-mysql-server/sql" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) func TestVarStringConvertNomsValueToValue(t *testing.T) { diff --git a/go/libraries/doltcore/schema/typeinfo/year.go b/go/libraries/doltcore/schema/typeinfo/year.go index 094e4339ba..883d09be16 100644 --- a/go/libraries/doltcore/schema/typeinfo/year.go +++ b/go/libraries/doltcore/schema/typeinfo/year.go @@ -18,9 +18,9 @@ import ( "fmt" "strconv" - "github.com/liquidata-inc/go-mysql-server/sql" + "github.com/dolthub/go-mysql-server/sql" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) // This is a dolt implementation of the MySQL type Year, thus most of the functionality diff --git a/go/libraries/doltcore/schema/typeinfo/year_test.go b/go/libraries/doltcore/schema/typeinfo/year_test.go index 921438142d..67830335d8 100644 --- a/go/libraries/doltcore/schema/typeinfo/year_test.go +++ b/go/libraries/doltcore/schema/typeinfo/year_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) func TestYearConvertNomsValueToValue(t *testing.T) { diff --git a/go/libraries/doltcore/sql/sqltestutil/data.go b/go/libraries/doltcore/sql/sqltestutil/data.go index 9fef0a8ef4..40cb3bd1e3 100644 --- a/go/libraries/doltcore/sql/sqltestutil/data.go +++ b/go/libraries/doltcore/sql/sqltestutil/data.go @@ -23,15 +23,15 @@ import ( "github.com/google/uuid" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/dtestutils" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/envtestutils" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema/typeinfo" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/untyped" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/dtestutils" + "github.com/dolthub/dolt/go/libraries/doltcore/env" + "github.com/dolthub/dolt/go/libraries/doltcore/envtestutils" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/schema/typeinfo" + "github.com/dolthub/dolt/go/libraries/doltcore/table/untyped" + "github.com/dolthub/dolt/go/store/types" ) // This file collects useful test table definitions and functions for SQL tests to use. It primarily defines a table diff --git a/go/libraries/doltcore/sqle/branches_table.go b/go/libraries/doltcore/sqle/branches_table.go index 94591d09d4..110d1ef6ea 100644 --- a/go/libraries/doltcore/sqle/branches_table.go +++ b/go/libraries/doltcore/sqle/branches_table.go @@ -18,10 +18,10 @@ import ( "errors" "io" - "github.com/liquidata-inc/go-mysql-server/sql" + "github.com/dolthub/go-mysql-server/sql" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/ref" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/ref" ) var _ sql.Table = (*BranchesTable)(nil) diff --git a/go/libraries/doltcore/sqle/common_test.go b/go/libraries/doltcore/sqle/common_test.go index 98c67f37ec..bae783abc6 100644 --- a/go/libraries/doltcore/sqle/common_test.go +++ b/go/libraries/doltcore/sqle/common_test.go @@ -19,20 +19,20 @@ import ( "io" "testing" - "github.com/liquidata-inc/go-mysql-server/sql" + "github.com/dolthub/go-mysql-server/sql" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/dtestutils" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/envtestutils" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema/typeinfo" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/sql/sqltestutil" - sqleSchema "github.com/liquidata-inc/dolt/go/libraries/doltcore/sqle/schema" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/dtestutils" + "github.com/dolthub/dolt/go/libraries/doltcore/env" + "github.com/dolthub/dolt/go/libraries/doltcore/envtestutils" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/schema/typeinfo" + "github.com/dolthub/dolt/go/libraries/doltcore/sql/sqltestutil" + sqleSchema "github.com/dolthub/dolt/go/libraries/doltcore/sqle/schema" + "github.com/dolthub/dolt/go/store/types" ) // SetupFunc can be run to perform additional setup work before a test case diff --git a/go/libraries/doltcore/sqle/conflicts_tables.go b/go/libraries/doltcore/sqle/conflicts_tables.go index 45f2de8845..3fd299d66d 100644 --- a/go/libraries/doltcore/sqle/conflicts_tables.go +++ b/go/libraries/doltcore/sqle/conflicts_tables.go @@ -15,12 +15,12 @@ package sqle // limitations under the License. import ( - "github.com/liquidata-inc/go-mysql-server/sql" + "github.com/dolthub/go-mysql-server/sql" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/merge" - sqleSchema "github.com/liquidata-inc/dolt/go/libraries/doltcore/sqle/schema" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/merge" + sqleSchema "github.com/dolthub/dolt/go/libraries/doltcore/sqle/schema" + "github.com/dolthub/dolt/go/store/types" ) var _ sql.Table = ConflictsTable{} diff --git a/go/libraries/doltcore/sqle/database.go b/go/libraries/doltcore/sqle/database.go index b518ce2aa4..6ef6bc6ce6 100644 --- a/go/libraries/doltcore/sqle/database.go +++ b/go/libraries/doltcore/sqle/database.go @@ -22,20 +22,20 @@ import ( "sync" "time" - "github.com/liquidata-inc/go-mysql-server/sql" - "github.com/liquidata-inc/go-mysql-server/sql/parse" - "github.com/liquidata-inc/go-mysql-server/sql/plan" - "github.com/liquidata-inc/vitess/go/vt/proto/query" + "github.com/dolthub/go-mysql-server/sql" + "github.com/dolthub/go-mysql-server/sql/parse" + "github.com/dolthub/go-mysql-server/sql/plan" + "github.com/dolthub/vitess/go/vt/proto/query" "gopkg.in/src-d/go-errors.v1" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/env/actions/commitwalk" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema/alterschema" - sqleSchema "github.com/liquidata-inc/dolt/go/libraries/doltcore/sqle/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/sqle/sqlfmt" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/env" + "github.com/dolthub/dolt/go/libraries/doltcore/env/actions/commitwalk" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/schema/alterschema" + sqleSchema "github.com/dolthub/dolt/go/libraries/doltcore/sqle/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/sqle/sqlfmt" + "github.com/dolthub/dolt/go/store/hash" ) type commitBehavior int8 diff --git a/go/libraries/doltcore/sqle/dfunctions/commit.go b/go/libraries/doltcore/sqle/dfunctions/commit.go index 5a1721a48a..c2c3ecd867 100644 --- a/go/libraries/doltcore/sqle/dfunctions/commit.go +++ b/go/libraries/doltcore/sqle/dfunctions/commit.go @@ -18,11 +18,11 @@ import ( "errors" "fmt" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/sqle" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/sqle" - "github.com/liquidata-inc/go-mysql-server/sql" - "github.com/liquidata-inc/go-mysql-server/sql/expression" + "github.com/dolthub/go-mysql-server/sql" + "github.com/dolthub/go-mysql-server/sql/expression" ) const CommitFuncName = "commit" diff --git a/go/libraries/doltcore/sqle/dfunctions/hashof.go b/go/libraries/doltcore/sqle/dfunctions/hashof.go index 36f1e6c4b7..fc9aa36933 100644 --- a/go/libraries/doltcore/sqle/dfunctions/hashof.go +++ b/go/libraries/doltcore/sqle/dfunctions/hashof.go @@ -20,12 +20,12 @@ import ( "fmt" "strings" - "github.com/liquidata-inc/go-mysql-server/sql" - "github.com/liquidata-inc/go-mysql-server/sql/expression" + "github.com/dolthub/go-mysql-server/sql" + "github.com/dolthub/go-mysql-server/sql/expression" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/ref" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/sqle" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/ref" + "github.com/dolthub/dolt/go/libraries/doltcore/sqle" ) const HashOfFuncName = "hashof" diff --git a/go/libraries/doltcore/sqle/dfunctions/init.go b/go/libraries/doltcore/sqle/dfunctions/init.go index 68ca06aaa6..02be054329 100644 --- a/go/libraries/doltcore/sqle/dfunctions/init.go +++ b/go/libraries/doltcore/sqle/dfunctions/init.go @@ -14,7 +14,7 @@ package dfunctions -import "github.com/liquidata-inc/go-mysql-server/sql" +import "github.com/dolthub/go-mysql-server/sql" var DoltFunctions = []sql.Function{ sql.Function1{Name: HashOfFuncName, Fn: NewHashOf}, diff --git a/go/libraries/doltcore/sqle/dfunctions/merge.go b/go/libraries/doltcore/sqle/dfunctions/merge.go index ba23e01cb7..9f54fe3959 100644 --- a/go/libraries/doltcore/sqle/dfunctions/merge.go +++ b/go/libraries/doltcore/sqle/dfunctions/merge.go @@ -18,13 +18,13 @@ import ( "errors" "fmt" - "github.com/liquidata-inc/go-mysql-server/sql" - "github.com/liquidata-inc/go-mysql-server/sql/expression" + "github.com/dolthub/go-mysql-server/sql" + "github.com/dolthub/go-mysql-server/sql/expression" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/merge" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/sqle" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/merge" + "github.com/dolthub/dolt/go/libraries/doltcore/sqle" + "github.com/dolthub/dolt/go/store/hash" ) const MergeFuncName = "merge" diff --git a/go/libraries/doltcore/sqle/diff_table.go b/go/libraries/doltcore/sqle/diff_table.go index d7c32d69d0..3fc11cf8e9 100644 --- a/go/libraries/doltcore/sqle/diff_table.go +++ b/go/libraries/doltcore/sqle/diff_table.go @@ -19,19 +19,19 @@ import ( "errors" "fmt" - "github.com/liquidata-inc/go-mysql-server/sql" - "github.com/liquidata-inc/go-mysql-server/sql/parse" + "github.com/dolthub/go-mysql-server/sql" + "github.com/dolthub/go-mysql-server/sql/parse" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/diff" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/rowconv" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/sqle/expreval" - sqleSchema "github.com/liquidata-inc/dolt/go/libraries/doltcore/sqle/schema" - "github.com/liquidata-inc/dolt/go/libraries/utils/set" - "github.com/liquidata-inc/dolt/go/store/hash" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/diff" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/rowconv" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/sqle/expreval" + sqleSchema "github.com/dolthub/dolt/go/libraries/doltcore/sqle/schema" + "github.com/dolthub/dolt/go/libraries/utils/set" + "github.com/dolthub/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/types" ) const ( diff --git a/go/libraries/doltcore/sqle/dolt_index.go b/go/libraries/doltcore/sqle/dolt_index.go index f0fd1fe248..9299207525 100644 --- a/go/libraries/doltcore/sqle/dolt_index.go +++ b/go/libraries/doltcore/sqle/dolt_index.go @@ -17,13 +17,13 @@ package sqle import ( "errors" - "github.com/liquidata-inc/go-mysql-server/sql" + "github.com/dolthub/go-mysql-server/sql" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/typed/noms" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/table" + "github.com/dolthub/dolt/go/libraries/doltcore/table/typed/noms" + "github.com/dolthub/dolt/go/store/types" ) type DoltIndex interface { diff --git a/go/libraries/doltcore/sqle/dolt_index_test.go b/go/libraries/doltcore/sqle/dolt_index_test.go index 78ec6f568e..2d897920f0 100644 --- a/go/libraries/doltcore/sqle/dolt_index_test.go +++ b/go/libraries/doltcore/sqle/dolt_index_test.go @@ -21,14 +21,14 @@ import ( "testing" "time" - "github.com/liquidata-inc/go-mysql-server/sql" + "github.com/dolthub/go-mysql-server/sql" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/dtestutils" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/dtestutils" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/store/types" ) type doltIndexTestCase struct { diff --git a/go/libraries/doltcore/sqle/dolt_session.go b/go/libraries/doltcore/sqle/dolt_session.go index 7ff4c4f614..695827245d 100644 --- a/go/libraries/doltcore/sqle/dolt_session.go +++ b/go/libraries/doltcore/sqle/dolt_session.go @@ -18,11 +18,11 @@ import ( "context" "fmt" - "github.com/liquidata-inc/go-mysql-server/sql" + "github.com/dolthub/go-mysql-server/sql" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/env" + "github.com/dolthub/dolt/go/store/hash" ) type dbRoot struct { diff --git a/go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go b/go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go index c34d60a026..2b87fa0c96 100755 --- a/go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go +++ b/go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go @@ -17,9 +17,9 @@ package enginetest import ( "testing" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/sqle" + "github.com/dolthub/dolt/go/libraries/doltcore/sqle" - "github.com/liquidata-inc/go-mysql-server/enginetest" + "github.com/dolthub/go-mysql-server/enginetest" ) func init() { diff --git a/go/libraries/doltcore/sqle/enginetest/dolt_harness.go b/go/libraries/doltcore/sqle/enginetest/dolt_harness.go index d9f72b889c..784013d9f4 100755 --- a/go/libraries/doltcore/sqle/enginetest/dolt_harness.go +++ b/go/libraries/doltcore/sqle/enginetest/dolt_harness.go @@ -20,14 +20,14 @@ import ( "strings" "testing" - "github.com/liquidata-inc/go-mysql-server/enginetest" - "github.com/liquidata-inc/go-mysql-server/sql" + "github.com/dolthub/go-mysql-server/enginetest" + "github.com/dolthub/go-mysql-server/sql" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/dtestutils" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/sqle" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/sqle/dfunctions" + "github.com/dolthub/dolt/go/libraries/doltcore/dtestutils" + "github.com/dolthub/dolt/go/libraries/doltcore/env" + "github.com/dolthub/dolt/go/libraries/doltcore/sqle" + "github.com/dolthub/dolt/go/libraries/doltcore/sqle/dfunctions" ) type DoltHarness struct { diff --git a/go/libraries/doltcore/sqle/expreval/compare_ops.go b/go/libraries/doltcore/sqle/expreval/compare_ops.go index f587e94b38..3422fc0301 100644 --- a/go/libraries/doltcore/sqle/expreval/compare_ops.go +++ b/go/libraries/doltcore/sqle/expreval/compare_ops.go @@ -15,9 +15,9 @@ package expreval import ( - "github.com/liquidata-inc/go-mysql-server/sql/expression" + "github.com/dolthub/go-mysql-server/sql/expression" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) func compareLiterals(l1, l2 *expression.Literal) (int, error) { diff --git a/go/libraries/doltcore/sqle/expreval/compare_ops_test.go b/go/libraries/doltcore/sqle/expreval/compare_ops_test.go index 38ddb38e67..05b854193c 100644 --- a/go/libraries/doltcore/sqle/expreval/compare_ops_test.go +++ b/go/libraries/doltcore/sqle/expreval/compare_ops_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) func getMustBool(t *testing.T) func(bool, error) bool { diff --git a/go/libraries/doltcore/sqle/expreval/expression_evaluator.go b/go/libraries/doltcore/sqle/expreval/expression_evaluator.go index 42e7c6fe77..83d8c4d592 100644 --- a/go/libraries/doltcore/sqle/expreval/expression_evaluator.go +++ b/go/libraries/doltcore/sqle/expreval/expression_evaluator.go @@ -17,12 +17,12 @@ package expreval import ( "context" - "github.com/liquidata-inc/go-mysql-server/sql" - "github.com/liquidata-inc/go-mysql-server/sql/expression" + "github.com/dolthub/go-mysql-server/sql" + "github.com/dolthub/go-mysql-server/sql/expression" "gopkg.in/src-d/go-errors.v1" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/store/types" ) var errUnsupportedComparisonType = errors.NewKind("Unsupported Comparison Type.") diff --git a/go/libraries/doltcore/sqle/expreval/expression_evaluator_test.go b/go/libraries/doltcore/sqle/expreval/expression_evaluator_test.go index c08e1a137d..abf4e582e2 100644 --- a/go/libraries/doltcore/sqle/expreval/expression_evaluator_test.go +++ b/go/libraries/doltcore/sqle/expreval/expression_evaluator_test.go @@ -20,13 +20,13 @@ import ( "testing" "time" - "github.com/liquidata-inc/go-mysql-server/sql" - "github.com/liquidata-inc/go-mysql-server/sql/expression" + "github.com/dolthub/go-mysql-server/sql" + "github.com/dolthub/go-mysql-server/sql/expression" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/store/types" ) func TestGetComparisonType(t *testing.T) { diff --git a/go/libraries/doltcore/sqle/expreval/literal_helpers.go b/go/libraries/doltcore/sqle/expreval/literal_helpers.go index 86100295f0..d14c99641d 100644 --- a/go/libraries/doltcore/sqle/expreval/literal_helpers.go +++ b/go/libraries/doltcore/sqle/expreval/literal_helpers.go @@ -18,10 +18,10 @@ import ( "strconv" "time" - "github.com/liquidata-inc/go-mysql-server/sql" - "github.com/liquidata-inc/go-mysql-server/sql/expression" + "github.com/dolthub/go-mysql-server/sql" + "github.com/dolthub/go-mysql-server/sql/expression" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) func literalAsInt64(literal *expression.Literal) (int64, error) { diff --git a/go/libraries/doltcore/sqle/expreval/literal_helpers_test.go b/go/libraries/doltcore/sqle/expreval/literal_helpers_test.go index 76cf123cec..b0399fd634 100644 --- a/go/libraries/doltcore/sqle/expreval/literal_helpers_test.go +++ b/go/libraries/doltcore/sqle/expreval/literal_helpers_test.go @@ -18,11 +18,11 @@ import ( "testing" "time" - "github.com/liquidata-inc/go-mysql-server/sql" - "github.com/liquidata-inc/go-mysql-server/sql/expression" + "github.com/dolthub/go-mysql-server/sql" + "github.com/dolthub/go-mysql-server/sql/expression" "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) func TestLiteralAsInt64(t *testing.T) { diff --git a/go/libraries/doltcore/sqle/filtered_reader.go b/go/libraries/doltcore/sqle/filtered_reader.go index 67c69253c4..5c699031a6 100644 --- a/go/libraries/doltcore/sqle/filtered_reader.go +++ b/go/libraries/doltcore/sqle/filtered_reader.go @@ -19,16 +19,16 @@ import ( "strings" "sync" - "github.com/liquidata-inc/go-mysql-server/sql" - "github.com/liquidata-inc/go-mysql-server/sql/expression" + "github.com/dolthub/go-mysql-server/sql" + "github.com/dolthub/go-mysql-server/sql/expression" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/sqle/expreval" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/sqle/setalgebra" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/typed/noms" - "github.com/liquidata-inc/dolt/go/store/hash" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/sqle/expreval" + "github.com/dolthub/dolt/go/libraries/doltcore/sqle/setalgebra" + "github.com/dolthub/dolt/go/libraries/doltcore/table" + "github.com/dolthub/dolt/go/libraries/doltcore/table/typed/noms" + "github.com/dolthub/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/types" ) type createSetFunc func(nbf *types.NomsBinFormat, val types.Value) (setalgebra.Set, error) diff --git a/go/libraries/doltcore/sqle/filtered_reader_test.go b/go/libraries/doltcore/sqle/filtered_reader_test.go index f7ecbd19c4..737d58c1bd 100644 --- a/go/libraries/doltcore/sqle/filtered_reader_test.go +++ b/go/libraries/doltcore/sqle/filtered_reader_test.go @@ -19,15 +19,15 @@ import ( "io" "testing" - "github.com/liquidata-inc/go-mysql-server/sql" - "github.com/liquidata-inc/go-mysql-server/sql/expression" + "github.com/dolthub/go-mysql-server/sql" + "github.com/dolthub/go-mysql-server/sql/expression" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/dbfactory" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/dbfactory" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/store/types" ) const ( diff --git a/go/libraries/doltcore/sqle/history_table.go b/go/libraries/doltcore/sqle/history_table.go index b2e3bf846d..8b94c655d1 100644 --- a/go/libraries/doltcore/sqle/history_table.go +++ b/go/libraries/doltcore/sqle/history_table.go @@ -19,17 +19,17 @@ import ( "io" "strings" - "github.com/liquidata-inc/go-mysql-server/sql" - "github.com/liquidata-inc/go-mysql-server/sql/expression" + "github.com/dolthub/go-mysql-server/sql" + "github.com/dolthub/go-mysql-server/sql/expression" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/rowconv" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - sqleSchema "github.com/liquidata-inc/dolt/go/libraries/doltcore/sqle/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table" - "github.com/liquidata-inc/dolt/go/libraries/utils/set" - "github.com/liquidata-inc/dolt/go/store/hash" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/rowconv" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + sqleSchema "github.com/dolthub/dolt/go/libraries/doltcore/sqle/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/table" + "github.com/dolthub/dolt/go/libraries/utils/set" + "github.com/dolthub/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/types" ) const ( diff --git a/go/libraries/doltcore/sqle/index_lookup.go b/go/libraries/doltcore/sqle/index_lookup.go index 653d6a1bcc..cc72dbfc87 100644 --- a/go/libraries/doltcore/sqle/index_lookup.go +++ b/go/libraries/doltcore/sqle/index_lookup.go @@ -17,10 +17,10 @@ package sqle import ( "fmt" - "github.com/liquidata-inc/go-mysql-server/sql" + "github.com/dolthub/go-mysql-server/sql" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/table" ) type IndexLookupKeyIterator interface { diff --git a/go/libraries/doltcore/sqle/index_row_iter.go b/go/libraries/doltcore/sqle/index_row_iter.go index 277ccc2038..3a7896a93a 100644 --- a/go/libraries/doltcore/sqle/index_row_iter.go +++ b/go/libraries/doltcore/sqle/index_row_iter.go @@ -17,10 +17,10 @@ package sqle import ( "io" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/store/types" - "github.com/liquidata-inc/go-mysql-server/sql" + "github.com/dolthub/go-mysql-server/sql" ) type indexLookupRowIterAdapter struct { diff --git a/go/libraries/doltcore/sqle/indexed_dolt_table.go b/go/libraries/doltcore/sqle/indexed_dolt_table.go index 07d43bfc89..9cd0a940bf 100644 --- a/go/libraries/doltcore/sqle/indexed_dolt_table.go +++ b/go/libraries/doltcore/sqle/indexed_dolt_table.go @@ -14,7 +14,7 @@ package sqle -import "github.com/liquidata-inc/go-mysql-server/sql" +import "github.com/dolthub/go-mysql-server/sql" // IndexedDoltTable is a wrapper for a DoltTable and a doltIndexLookup. It implements the sql.Table interface like // DoltTable, but its RowIter function returns values that match the indexLookup, instead of all rows. It's returned by diff --git a/go/libraries/doltcore/sqle/integration_test/history_table_test.go b/go/libraries/doltcore/sqle/integration_test/history_table_test.go index aa564405cd..d7b3ce3560 100644 --- a/go/libraries/doltcore/sqle/integration_test/history_table_test.go +++ b/go/libraries/doltcore/sqle/integration_test/history_table_test.go @@ -19,15 +19,15 @@ import ( "fmt" "testing" - "github.com/liquidata-inc/go-mysql-server/sql" + "github.com/dolthub/go-mysql-server/sql" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/cmd/dolt/cli" - "github.com/liquidata-inc/dolt/go/cmd/dolt/commands" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/dtestutils" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/sqle" + "github.com/dolthub/dolt/go/cmd/dolt/cli" + "github.com/dolthub/dolt/go/cmd/dolt/commands" + "github.com/dolthub/dolt/go/libraries/doltcore/dtestutils" + "github.com/dolthub/dolt/go/libraries/doltcore/env" + "github.com/dolthub/dolt/go/libraries/doltcore/sqle" ) func TestHistoryTable(t *testing.T) { diff --git a/go/libraries/doltcore/sqle/integration_test/stockmarket_test.go b/go/libraries/doltcore/sqle/integration_test/stockmarket_test.go index 11f9ca3591..78cb7501d8 100644 --- a/go/libraries/doltcore/sqle/integration_test/stockmarket_test.go +++ b/go/libraries/doltcore/sqle/integration_test/stockmarket_test.go @@ -19,12 +19,12 @@ import ( "strings" "testing" - "github.com/liquidata-inc/go-mysql-server/sql" + "github.com/dolthub/go-mysql-server/sql" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/dtestutils" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/sqle" + "github.com/dolthub/dolt/go/libraries/doltcore/dtestutils" + "github.com/dolthub/dolt/go/libraries/doltcore/sqle" ) // This tests running queries against a modified subset of the stockmarket data set found here: diff --git a/go/libraries/doltcore/sqle/log_table.go b/go/libraries/doltcore/sqle/log_table.go index 5ed1f3a081..dc85082057 100644 --- a/go/libraries/doltcore/sqle/log_table.go +++ b/go/libraries/doltcore/sqle/log_table.go @@ -17,10 +17,10 @@ package sqle import ( "io" - "github.com/liquidata-inc/go-mysql-server/sql" + "github.com/dolthub/go-mysql-server/sql" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/env/actions" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/env/actions" ) var _ sql.Table = (*LogTable)(nil) diff --git a/go/libraries/doltcore/sqle/logictest/dolt/doltharness.go b/go/libraries/doltcore/sqle/logictest/dolt/doltharness.go index 743eebbe54..047db83ef9 100644 --- a/go/libraries/doltcore/sqle/logictest/dolt/doltharness.go +++ b/go/libraries/doltcore/sqle/logictest/dolt/doltharness.go @@ -22,18 +22,18 @@ import ( "strconv" "strings" - sqle "github.com/liquidata-inc/go-mysql-server" - "github.com/liquidata-inc/go-mysql-server/sql" + sqle "github.com/dolthub/go-mysql-server" + "github.com/dolthub/go-mysql-server/sql" + "github.com/dolthub/vitess/go/vt/proto/query" + "github.com/dolthub/vitess/go/vt/sqlparser" "github.com/liquidata-inc/sqllogictest/go/logictest" - "github.com/liquidata-inc/vitess/go/vt/proto/query" - "github.com/liquidata-inc/vitess/go/vt/sqlparser" "github.com/shopspring/decimal" - "github.com/liquidata-inc/dolt/go/cmd/dolt/commands" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/env" - dsql "github.com/liquidata-inc/dolt/go/libraries/doltcore/sqle" - "github.com/liquidata-inc/dolt/go/libraries/utils/filesys" + "github.com/dolthub/dolt/go/cmd/dolt/commands" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/env" + dsql "github.com/dolthub/dolt/go/libraries/doltcore/sqle" + "github.com/dolthub/dolt/go/libraries/utils/filesys" ) var _ logictest.Harness = &DoltHarness{} diff --git a/go/libraries/doltcore/sqle/logictest/dolt/doltharness_test.go b/go/libraries/doltcore/sqle/logictest/dolt/doltharness_test.go index a50e1a06fc..a2689af156 100644 --- a/go/libraries/doltcore/sqle/logictest/dolt/doltharness_test.go +++ b/go/libraries/doltcore/sqle/logictest/dolt/doltharness_test.go @@ -21,10 +21,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/env" + "github.com/dolthub/dolt/go/libraries/utils/filesys" + "github.com/dolthub/dolt/go/store/types" ) func createTestEnvWithFS(fs filesys.Filesys, workingDir string) *env.DoltEnv { diff --git a/go/libraries/doltcore/sqle/logictest/main/main.go b/go/libraries/doltcore/sqle/logictest/main/main.go index c67c2152aa..eb04c40f03 100644 --- a/go/libraries/doltcore/sqle/logictest/main/main.go +++ b/go/libraries/doltcore/sqle/logictest/main/main.go @@ -21,7 +21,7 @@ import ( "github.com/liquidata-inc/sqllogictest/go/logictest" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/sqle/logictest/dolt" + "github.com/dolthub/dolt/go/libraries/doltcore/sqle/logictest/dolt" ) // Runs all sqllogictest test files (or directories containing them) given as arguments. diff --git a/go/libraries/doltcore/sqle/query_catalog_table.go b/go/libraries/doltcore/sqle/query_catalog_table.go index 3d83b3bdf2..baf41352a6 100644 --- a/go/libraries/doltcore/sqle/query_catalog_table.go +++ b/go/libraries/doltcore/sqle/query_catalog_table.go @@ -20,10 +20,10 @@ import ( "github.com/google/uuid" "gopkg.in/src-d/go-errors.v1" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/store/types" ) var queryCatalogCols, _ = schema.NewColCollection( diff --git a/go/libraries/doltcore/sqle/query_catalog_table_test.go b/go/libraries/doltcore/sqle/query_catalog_table_test.go index ef30f9cca9..bf871a71c9 100644 --- a/go/libraries/doltcore/sqle/query_catalog_table_test.go +++ b/go/libraries/doltcore/sqle/query_catalog_table_test.go @@ -18,13 +18,13 @@ import ( "context" "testing" - "github.com/liquidata-inc/go-mysql-server/sql" + "github.com/dolthub/go-mysql-server/sql" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/dtestutils" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/sql/sqltestutil" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/dtestutils" + "github.com/dolthub/dolt/go/libraries/doltcore/sql/sqltestutil" ) func TestInsertIntoQueryCatalogTable(t *testing.T) { diff --git a/go/libraries/doltcore/sqle/rows.go b/go/libraries/doltcore/sqle/rows.go index 113d08ae33..a9784c0bc0 100644 --- a/go/libraries/doltcore/sqle/rows.go +++ b/go/libraries/doltcore/sqle/rows.go @@ -18,11 +18,11 @@ import ( "fmt" "io" - "github.com/liquidata-inc/go-mysql-server/sql" + "github.com/dolthub/go-mysql-server/sql" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/store/types" ) // An iterator over the rows of a table. diff --git a/go/libraries/doltcore/sqle/schema/schema.go b/go/libraries/doltcore/sqle/schema/schema.go index bf5d398432..74b536b12c 100644 --- a/go/libraries/doltcore/sqle/schema/schema.go +++ b/go/libraries/doltcore/sqle/schema/schema.go @@ -18,16 +18,16 @@ import ( "context" "fmt" - sqle "github.com/liquidata-inc/go-mysql-server" - "github.com/liquidata-inc/go-mysql-server/sql" - "github.com/liquidata-inc/go-mysql-server/sql/parse" - "github.com/liquidata-inc/vitess/go/vt/sqlparser" + sqle "github.com/dolthub/go-mysql-server" + "github.com/dolthub/go-mysql-server/sql" + "github.com/dolthub/go-mysql-server/sql/parse" + "github.com/dolthub/vitess/go/vt/sqlparser" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema/typeinfo" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/schema/typeinfo" + "github.com/dolthub/dolt/go/store/types" ) // ApplyDefaults applies the default values to the given indices, returning the resulting row. diff --git a/go/libraries/doltcore/sqle/schema_table.go b/go/libraries/doltcore/sqle/schema_table.go index 09c1856ad2..a2002fec10 100644 --- a/go/libraries/doltcore/sqle/schema_table.go +++ b/go/libraries/doltcore/sqle/schema_table.go @@ -15,9 +15,9 @@ package sqle import ( - "github.com/liquidata-inc/go-mysql-server/sql" + "github.com/dolthub/go-mysql-server/sql" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" ) // The fixed schema for the `dolt_schemas` table. diff --git a/go/libraries/doltcore/sqle/schema_util_test.go b/go/libraries/doltcore/sqle/schema_util_test.go index c323be9c48..5f47dea27d 100644 --- a/go/libraries/doltcore/sqle/schema_util_test.go +++ b/go/libraries/doltcore/sqle/schema_util_test.go @@ -18,11 +18,11 @@ import ( "fmt" "strconv" - "github.com/liquidata-inc/dolt/go/libraries/utils/set" + "github.com/dolthub/dolt/go/libraries/utils/set" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/store/types" ) // Creates a new schema for a result set specified by the given pairs of column names and types. Column names are diff --git a/go/libraries/doltcore/sqle/setalgebra/finite_set.go b/go/libraries/doltcore/sqle/setalgebra/finite_set.go index 9dfe64234c..7a2121ff45 100644 --- a/go/libraries/doltcore/sqle/setalgebra/finite_set.go +++ b/go/libraries/doltcore/sqle/setalgebra/finite_set.go @@ -15,8 +15,8 @@ package setalgebra import ( - "github.com/liquidata-inc/dolt/go/store/hash" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/types" ) // FiniteSet is your typical computer science set representing a finite number of unique objects stored in a map. An diff --git a/go/libraries/doltcore/sqle/setalgebra/intersection.go b/go/libraries/doltcore/sqle/setalgebra/intersection.go index 3e50f1678b..1999d776c6 100644 --- a/go/libraries/doltcore/sqle/setalgebra/intersection.go +++ b/go/libraries/doltcore/sqle/setalgebra/intersection.go @@ -15,8 +15,8 @@ package setalgebra import ( - "github.com/liquidata-inc/dolt/go/store/hash" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/types" ) // finiteSetIntersection returns the set of points that are in both fs1 and fs2 diff --git a/go/libraries/doltcore/sqle/setalgebra/intersection_test.go b/go/libraries/doltcore/sqle/setalgebra/intersection_test.go index b4df32b99d..62b198ea79 100644 --- a/go/libraries/doltcore/sqle/setalgebra/intersection_test.go +++ b/go/libraries/doltcore/sqle/setalgebra/intersection_test.go @@ -20,8 +20,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/store/hash" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/types" ) func TestFiniteSetIntersection(t *testing.T) { diff --git a/go/libraries/doltcore/sqle/setalgebra/interval.go b/go/libraries/doltcore/sqle/setalgebra/interval.go index 62d902260c..991b64c23e 100644 --- a/go/libraries/doltcore/sqle/setalgebra/interval.go +++ b/go/libraries/doltcore/sqle/setalgebra/interval.go @@ -14,7 +14,7 @@ package setalgebra -import "github.com/liquidata-inc/dolt/go/store/types" +import "github.com/dolthub/dolt/go/store/types" // IntervalEndpoint is a value at which an interval starts or ends, and a boolean which indicates whether // the Interval is open or closed at that endpoint. diff --git a/go/libraries/doltcore/sqle/setalgebra/interval_test.go b/go/libraries/doltcore/sqle/setalgebra/interval_test.go index 3451e81e16..e7534d6ac2 100644 --- a/go/libraries/doltcore/sqle/setalgebra/interval_test.go +++ b/go/libraries/doltcore/sqle/setalgebra/interval_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) func testInterv(start, end *IntervalEndpoint) Interval { diff --git a/go/libraries/doltcore/sqle/setalgebra/set_test.go b/go/libraries/doltcore/sqle/setalgebra/set_test.go index bd09cf3c75..f6b53e49c3 100644 --- a/go/libraries/doltcore/sqle/setalgebra/set_test.go +++ b/go/libraries/doltcore/sqle/setalgebra/set_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) func TestEmptySet(t *testing.T) { diff --git a/go/libraries/doltcore/sqle/setalgebra/union.go b/go/libraries/doltcore/sqle/setalgebra/union.go index 20c852b071..1554cdfa67 100644 --- a/go/libraries/doltcore/sqle/setalgebra/union.go +++ b/go/libraries/doltcore/sqle/setalgebra/union.go @@ -15,8 +15,8 @@ package setalgebra import ( - "github.com/liquidata-inc/dolt/go/store/hash" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/types" ) // finiteSetUnion adds all points from both sets to a new FiniteSet diff --git a/go/libraries/doltcore/sqle/setalgebra/union_test.go b/go/libraries/doltcore/sqle/setalgebra/union_test.go index f2d202a419..d51be830e0 100644 --- a/go/libraries/doltcore/sqle/setalgebra/union_test.go +++ b/go/libraries/doltcore/sqle/setalgebra/union_test.go @@ -20,8 +20,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/store/hash" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/types" ) func assertErr(t *testing.T, expectErr bool, err error) { diff --git a/go/libraries/doltcore/sqle/show_create_table.go b/go/libraries/doltcore/sqle/show_create_table.go index b3947f7e01..0ca212cbb7 100644 --- a/go/libraries/doltcore/sqle/show_create_table.go +++ b/go/libraries/doltcore/sqle/show_create_table.go @@ -18,8 +18,8 @@ import ( "context" "fmt" - sqle "github.com/liquidata-inc/go-mysql-server" - "github.com/liquidata-inc/go-mysql-server/sql" + sqle "github.com/dolthub/go-mysql-server" + "github.com/dolthub/go-mysql-server/sql" ) // These functions cannot be in the sqlfmt package as the reliance on the sqle package creates a circular reference. diff --git a/go/libraries/doltcore/sqle/single_table_info_db.go b/go/libraries/doltcore/sqle/single_table_info_db.go index d924d7f9b1..31174607a9 100644 --- a/go/libraries/doltcore/sqle/single_table_info_db.go +++ b/go/libraries/doltcore/sqle/single_table_info_db.go @@ -18,12 +18,12 @@ import ( "fmt" "strings" - "github.com/liquidata-inc/go-mysql-server/sql" + "github.com/dolthub/go-mysql-server/sql" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - sqleSchema "github.com/liquidata-inc/dolt/go/libraries/doltcore/sqle/schema" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + sqleSchema "github.com/dolthub/dolt/go/libraries/doltcore/sqle/schema" + "github.com/dolthub/dolt/go/store/types" ) // SingleTableInfoDatabase is intended to allow a sole schema to make use of any display functionality in `go-mysql-server`. diff --git a/go/libraries/doltcore/sqle/sqlbatch_test.go b/go/libraries/doltcore/sqle/sqlbatch_test.go index 85c63fc13f..6ae934fb8b 100644 --- a/go/libraries/doltcore/sqle/sqlbatch_test.go +++ b/go/libraries/doltcore/sqle/sqlbatch_test.go @@ -25,10 +25,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/dtestutils" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - . "github.com/liquidata-inc/dolt/go/libraries/doltcore/sql/sqltestutil" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/dtestutils" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + . "github.com/dolthub/dolt/go/libraries/doltcore/sql/sqltestutil" + "github.com/dolthub/dolt/go/store/types" ) func TestSqlBatchInserts(t *testing.T) { diff --git a/go/libraries/doltcore/sqle/sqlddl_test.go b/go/libraries/doltcore/sqle/sqlddl_test.go index b97b9db0d0..99d81817b5 100644 --- a/go/libraries/doltcore/sqle/sqlddl_test.go +++ b/go/libraries/doltcore/sqle/sqlddl_test.go @@ -20,19 +20,19 @@ import ( "strings" "testing" - "github.com/liquidata-inc/go-mysql-server/sql" - "github.com/liquidata-inc/vitess/go/sqltypes" + "github.com/dolthub/go-mysql-server/sql" + "github.com/dolthub/vitess/go/sqltypes" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/dtestutils" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - . "github.com/liquidata-inc/dolt/go/libraries/doltcore/sql/sqltestutil" - sqleSchema "github.com/liquidata-inc/dolt/go/libraries/doltcore/sqle/schema" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/dtestutils" + "github.com/dolthub/dolt/go/libraries/doltcore/env" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + . "github.com/dolthub/dolt/go/libraries/doltcore/sql/sqltestutil" + sqleSchema "github.com/dolthub/dolt/go/libraries/doltcore/sqle/schema" + "github.com/dolthub/dolt/go/store/types" ) func TestCreateTable(t *testing.T) { @@ -987,7 +987,7 @@ func TestAlterSystemTables(t *testing.T) { schemasTableDoltSchema(), NewRowWithPks([]types.Value{types.String("view"), types.String("name")}, types.String("select 2+2 from dual"))) - // The _history and _diff tables give not found errors right now because of https://github.com/liquidata-inc/dolt/issues/373. + // The _history and _diff tables give not found errors right now because of https://github.com/dolthub/dolt/issues/373. // We can remove the divergent failure logic when the issue is fixed. t.Run("Drop", func(t *testing.T) { for _, tableName := range systemTableNames { diff --git a/go/libraries/doltcore/sqle/sqldelete_test.go b/go/libraries/doltcore/sqle/sqldelete_test.go index 1bcb939014..e7e3fba522 100644 --- a/go/libraries/doltcore/sqle/sqldelete_test.go +++ b/go/libraries/doltcore/sqle/sqldelete_test.go @@ -18,16 +18,16 @@ import ( "context" "testing" - sql "github.com/liquidata-inc/go-mysql-server/sql" + sql "github.com/dolthub/go-mysql-server/sql" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/dtestutils" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - . "github.com/liquidata-inc/dolt/go/libraries/doltcore/sql/sqltestutil" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/dtestutils" + "github.com/dolthub/dolt/go/libraries/doltcore/env" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + . "github.com/dolthub/dolt/go/libraries/doltcore/sql/sqltestutil" + "github.com/dolthub/dolt/go/store/types" ) // Set to the name of a single test to run just that test, useful for debugging diff --git a/go/libraries/doltcore/sqle/sqlfmt/row_fmt.go b/go/libraries/doltcore/sqle/sqlfmt/row_fmt.go index 12bf24e13e..ba83d4fef6 100644 --- a/go/libraries/doltcore/sqle/sqlfmt/row_fmt.go +++ b/go/libraries/doltcore/sqle/sqlfmt/row_fmt.go @@ -19,12 +19,12 @@ import ( "fmt" "strings" - "github.com/liquidata-inc/vitess/go/sqltypes" + "github.com/dolthub/vitess/go/sqltypes" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema/typeinfo" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/schema/typeinfo" + "github.com/dolthub/dolt/go/store/types" ) const singleQuote = `'` diff --git a/go/libraries/doltcore/sqle/sqlfmt/row_fmt_test.go b/go/libraries/doltcore/sqle/sqlfmt/row_fmt_test.go index 65795d13df..b673458011 100644 --- a/go/libraries/doltcore/sqle/sqlfmt/row_fmt_test.go +++ b/go/libraries/doltcore/sqle/sqlfmt/row_fmt_test.go @@ -21,11 +21,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/dtestutils" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema/typeinfo" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/dtestutils" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/schema/typeinfo" + "github.com/dolthub/dolt/go/store/types" ) const expectedDropSql = "DROP TABLE `table_name`;" diff --git a/go/libraries/doltcore/sqle/sqlfmt/schema_fmt.go b/go/libraries/doltcore/sqle/sqlfmt/schema_fmt.go index 229c29fc15..cfdcfe5ba7 100644 --- a/go/libraries/doltcore/sqle/sqlfmt/schema_fmt.go +++ b/go/libraries/doltcore/sqle/sqlfmt/schema_fmt.go @@ -18,9 +18,9 @@ import ( "fmt" "strings" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" ) // FmtCol converts a column to a string with a given indent space count, name width, and type width. If nameWidth or diff --git a/go/libraries/doltcore/sqle/sqlfmt/schema_fmt_test.go b/go/libraries/doltcore/sqle/sqlfmt/schema_fmt_test.go index 2b85487bbb..eaa1e6b7c8 100755 --- a/go/libraries/doltcore/sqle/sqlfmt/schema_fmt_test.go +++ b/go/libraries/doltcore/sqle/sqlfmt/schema_fmt_test.go @@ -15,8 +15,8 @@ package sqlfmt import ( - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/store/types" "testing" diff --git a/go/libraries/doltcore/sqle/sqlinsert_test.go b/go/libraries/doltcore/sqle/sqlinsert_test.go index c5bfda9431..3d5b37d63b 100644 --- a/go/libraries/doltcore/sqle/sqlinsert_test.go +++ b/go/libraries/doltcore/sqle/sqlinsert_test.go @@ -18,18 +18,18 @@ import ( "context" "testing" + "github.com/dolthub/go-mysql-server/sql" "github.com/google/uuid" - "github.com/liquidata-inc/go-mysql-server/sql" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/dtestutils" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - . "github.com/liquidata-inc/dolt/go/libraries/doltcore/sql/sqltestutil" - sqleSchema "github.com/liquidata-inc/dolt/go/libraries/doltcore/sqle/schema" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/dtestutils" + "github.com/dolthub/dolt/go/libraries/doltcore/env" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + . "github.com/dolthub/dolt/go/libraries/doltcore/sql/sqltestutil" + sqleSchema "github.com/dolthub/dolt/go/libraries/doltcore/sqle/schema" + "github.com/dolthub/dolt/go/store/types" ) // Set to the name of a single test to run just that test, useful for debugging diff --git a/go/libraries/doltcore/sqle/sqlreplace_test.go b/go/libraries/doltcore/sqle/sqlreplace_test.go index bb379a0468..b2652a82b5 100644 --- a/go/libraries/doltcore/sqle/sqlreplace_test.go +++ b/go/libraries/doltcore/sqle/sqlreplace_test.go @@ -18,17 +18,17 @@ import ( "context" "testing" + "github.com/dolthub/go-mysql-server/sql" "github.com/google/uuid" - "github.com/liquidata-inc/go-mysql-server/sql" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/dtestutils" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - . "github.com/liquidata-inc/dolt/go/libraries/doltcore/sql/sqltestutil" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/dtestutils" + "github.com/dolthub/dolt/go/libraries/doltcore/env" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + . "github.com/dolthub/dolt/go/libraries/doltcore/sql/sqltestutil" + "github.com/dolthub/dolt/go/store/types" ) // Set to the name of a single test to run just that test, useful for debugging diff --git a/go/libraries/doltcore/sqle/sqlselect_test.go b/go/libraries/doltcore/sqle/sqlselect_test.go index 83e1eef18a..466798855d 100644 --- a/go/libraries/doltcore/sqle/sqlselect_test.go +++ b/go/libraries/doltcore/sqle/sqlselect_test.go @@ -19,18 +19,18 @@ import ( "testing" "time" - "github.com/liquidata-inc/go-mysql-server/sql" + "github.com/dolthub/go-mysql-server/sql" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/dtestutils" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/envtestutils" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - . "github.com/liquidata-inc/dolt/go/libraries/doltcore/sql/sqltestutil" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/dtestutils" + "github.com/dolthub/dolt/go/libraries/doltcore/env" + "github.com/dolthub/dolt/go/libraries/doltcore/envtestutils" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + . "github.com/dolthub/dolt/go/libraries/doltcore/sql/sqltestutil" + "github.com/dolthub/dolt/go/store/types" ) // Set to the name of a single test to run just that test, useful for debugging @@ -709,7 +709,7 @@ var BasicSelectTests = []SelectTest{ "0o2rnf5pq2s1nq3hj3609e1lt0socuf1", "billy bob", "bigbillieb@fake.horse", - time.Date(1970, 1, 1, 0, 0, 0, 0, time.UTC), + time.Date(1970, 1, 1, 0, 0, 0, 0, &time.Location{}), "Initialize data repository", }, }, @@ -738,7 +738,7 @@ var BasicSelectTests = []SelectTest{ "master", "0o2rnf5pq2s1nq3hj3609e1lt0socuf1", "billy bob", "bigbillieb@fake.horse", - time.Date(1970, 1, 1, 0, 0, 0, 0, time.UTC), + time.Date(1970, 1, 1, 0, 0, 0, 0, &time.Location{}), "Initialize data repository", }, }, diff --git a/go/libraries/doltcore/sqle/sqlupdate_test.go b/go/libraries/doltcore/sqle/sqlupdate_test.go index 75376068d4..392a1324b3 100644 --- a/go/libraries/doltcore/sqle/sqlupdate_test.go +++ b/go/libraries/doltcore/sqle/sqlupdate_test.go @@ -18,17 +18,17 @@ import ( "context" "testing" + "github.com/dolthub/go-mysql-server/sql" "github.com/google/uuid" - "github.com/liquidata-inc/go-mysql-server/sql" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/dtestutils" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - . "github.com/liquidata-inc/dolt/go/libraries/doltcore/sql/sqltestutil" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/dtestutils" + "github.com/dolthub/dolt/go/libraries/doltcore/env" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + . "github.com/dolthub/dolt/go/libraries/doltcore/sql/sqltestutil" + "github.com/dolthub/dolt/go/store/types" ) // Set to the name of a single test to run just that test, useful for debugging diff --git a/go/libraries/doltcore/sqle/static_errors.go b/go/libraries/doltcore/sqle/static_errors.go index 1320f3a2b4..6c6b4c7aa4 100644 --- a/go/libraries/doltcore/sqle/static_errors.go +++ b/go/libraries/doltcore/sqle/static_errors.go @@ -15,7 +15,7 @@ package sqle import ( - "github.com/liquidata-inc/go-mysql-server/sql" + "github.com/dolthub/go-mysql-server/sql" ) type staticErrorTable struct { diff --git a/go/libraries/doltcore/sqle/table_editor.go b/go/libraries/doltcore/sqle/table_editor.go index b55b6f4fcb..d529209feb 100644 --- a/go/libraries/doltcore/sqle/table_editor.go +++ b/go/libraries/doltcore/sqle/table_editor.go @@ -15,10 +15,10 @@ package sqle import ( - "github.com/liquidata-inc/go-mysql-server/sql" + "github.com/dolthub/go-mysql-server/sql" - "github.com/liquidata-inc/dolt/go/cmd/dolt/errhand" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/cmd/dolt/errhand" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" ) // sqlTableEditor is a wrapper for *doltdb.SessionedTableEditor that complies with the SQL interface. diff --git a/go/libraries/doltcore/sqle/table_editor_fk_test.go b/go/libraries/doltcore/sqle/table_editor_fk_test.go index 42a88c4e95..dd64d12706 100644 --- a/go/libraries/doltcore/sqle/table_editor_fk_test.go +++ b/go/libraries/doltcore/sqle/table_editor_fk_test.go @@ -22,15 +22,15 @@ import ( "strings" "testing" - "github.com/liquidata-inc/go-mysql-server/sql" + "github.com/dolthub/go-mysql-server/sql" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/dtestutils" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/dtestutils" + "github.com/dolthub/dolt/go/libraries/doltcore/env" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/store/types" ) var fk_dEnv *env.DoltEnv diff --git a/go/libraries/doltcore/sqle/table_editor_index_test.go b/go/libraries/doltcore/sqle/table_editor_index_test.go index ace85951e1..511d55444d 100644 --- a/go/libraries/doltcore/sqle/table_editor_index_test.go +++ b/go/libraries/doltcore/sqle/table_editor_index_test.go @@ -19,15 +19,15 @@ import ( "strings" "testing" - "github.com/liquidata-inc/go-mysql-server/sql" + "github.com/dolthub/go-mysql-server/sql" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/dtestutils" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/dtestutils" + "github.com/dolthub/dolt/go/libraries/doltcore/env" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/store/types" ) var index_dEnv *env.DoltEnv diff --git a/go/libraries/doltcore/sqle/table_editor_test.go b/go/libraries/doltcore/sqle/table_editor_test.go index 7d409bbe0f..69a248b2fe 100644 --- a/go/libraries/doltcore/sqle/table_editor_test.go +++ b/go/libraries/doltcore/sqle/table_editor_test.go @@ -18,14 +18,14 @@ import ( "context" "testing" - "github.com/liquidata-inc/go-mysql-server/sql" + "github.com/dolthub/go-mysql-server/sql" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/dtestutils" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - . "github.com/liquidata-inc/dolt/go/libraries/doltcore/sql/sqltestutil" + "github.com/dolthub/dolt/go/libraries/doltcore/dtestutils" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + . "github.com/dolthub/dolt/go/libraries/doltcore/sql/sqltestutil" ) type tableEditorTest struct { diff --git a/go/libraries/doltcore/sqle/table_of_tables_in_conflict.go b/go/libraries/doltcore/sqle/table_of_tables_in_conflict.go index fd64ab64c1..e41f40de14 100644 --- a/go/libraries/doltcore/sqle/table_of_tables_in_conflict.go +++ b/go/libraries/doltcore/sqle/table_of_tables_in_conflict.go @@ -17,9 +17,9 @@ package sqle import ( "io" - "github.com/liquidata-inc/go-mysql-server/sql" + "github.com/dolthub/go-mysql-server/sql" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" ) var _ sql.Table = (*TableOfTablesInConflict)(nil) diff --git a/go/libraries/doltcore/sqle/tables.go b/go/libraries/doltcore/sqle/tables.go index 322e8d1898..c24c11a3ff 100644 --- a/go/libraries/doltcore/sqle/tables.go +++ b/go/libraries/doltcore/sqle/tables.go @@ -24,17 +24,17 @@ import ( "strings" "sync" - "github.com/liquidata-inc/go-mysql-server/sql" - "github.com/liquidata-inc/vitess/go/sqltypes" + "github.com/dolthub/go-mysql-server/sql" + "github.com/dolthub/vitess/go/sqltypes" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema/alterschema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema/encoding" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema/typeinfo" - sqleSchema "github.com/liquidata-inc/dolt/go/libraries/doltcore/sqle/schema" - "github.com/liquidata-inc/dolt/go/libraries/utils/set" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/schema/alterschema" + "github.com/dolthub/dolt/go/libraries/doltcore/schema/encoding" + "github.com/dolthub/dolt/go/libraries/doltcore/schema/typeinfo" + sqleSchema "github.com/dolthub/dolt/go/libraries/doltcore/sqle/schema" + "github.com/dolthub/dolt/go/libraries/utils/set" + "github.com/dolthub/dolt/go/store/types" ) const ( diff --git a/go/libraries/doltcore/sqle/testutil.go b/go/libraries/doltcore/sqle/testutil.go index c52a03d930..51a3fe0de3 100644 --- a/go/libraries/doltcore/sqle/testutil.go +++ b/go/libraries/doltcore/sqle/testutil.go @@ -21,12 +21,12 @@ import ( "io" "strings" - sqle "github.com/liquidata-inc/go-mysql-server" - "github.com/liquidata-inc/go-mysql-server/sql" - "github.com/liquidata-inc/vitess/go/vt/sqlparser" + sqle "github.com/dolthub/go-mysql-server" + "github.com/dolthub/go-mysql-server/sql" + "github.com/dolthub/vitess/go/vt/sqlparser" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/env" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/env" ) // Executes all the SQL non-select statements given in the string against the root value given and returns the updated diff --git a/go/libraries/doltcore/sqle/user_space_database.go b/go/libraries/doltcore/sqle/user_space_database.go index 71769c0976..bf0edd7a02 100644 --- a/go/libraries/doltcore/sqle/user_space_database.go +++ b/go/libraries/doltcore/sqle/user_space_database.go @@ -15,9 +15,9 @@ package sqle import ( - "github.com/liquidata-inc/go-mysql-server/sql" + "github.com/dolthub/go-mysql-server/sql" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" ) // UserSpaceDatabase in an implementation of sql.Database for root values. Does not expose any of the internal dolt tables. diff --git a/go/libraries/doltcore/sqle/views_test.go b/go/libraries/doltcore/sqle/views_test.go index 4e8819707d..f03f1e034a 100644 --- a/go/libraries/doltcore/sqle/views_test.go +++ b/go/libraries/doltcore/sqle/views_test.go @@ -18,11 +18,11 @@ import ( "context" "testing" - "github.com/liquidata-inc/go-mysql-server/sql" + "github.com/dolthub/go-mysql-server/sql" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/dtestutils" + "github.com/dolthub/dolt/go/libraries/doltcore/dtestutils" ) // Not an exhaustive test of views -- we rely on bats tests for end-to-end verification. diff --git a/go/libraries/doltcore/table/composite_table_reader.go b/go/libraries/doltcore/table/composite_table_reader.go index a1c26bd916..b0781303d4 100644 --- a/go/libraries/doltcore/table/composite_table_reader.go +++ b/go/libraries/doltcore/table/composite_table_reader.go @@ -18,8 +18,8 @@ import ( "context" "io" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" ) // CompositeTableReader is a TableReader implementation which will concatenate the results diff --git a/go/libraries/doltcore/table/composite_table_reader_test.go b/go/libraries/doltcore/table/composite_table_reader_test.go index 376f1cf6d7..a568ff31a4 100644 --- a/go/libraries/doltcore/table/composite_table_reader_test.go +++ b/go/libraries/doltcore/table/composite_table_reader_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/store/types" ) func TestCompositeTableReader(t *testing.T) { diff --git a/go/libraries/doltcore/table/errors.go b/go/libraries/doltcore/table/errors.go index 4c0b209b91..249f3da138 100644 --- a/go/libraries/doltcore/table/errors.go +++ b/go/libraries/doltcore/table/errors.go @@ -17,7 +17,7 @@ package table import ( "strings" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/row" ) // BadRow is an error which contains the row and details about what is wrong with it. diff --git a/go/libraries/doltcore/table/errors_test.go b/go/libraries/doltcore/table/errors_test.go index 6d9802a3de..d0a571bc52 100644 --- a/go/libraries/doltcore/table/errors_test.go +++ b/go/libraries/doltcore/table/errors_test.go @@ -19,9 +19,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/store/types" ) func TestBadRow(t *testing.T) { diff --git a/go/libraries/doltcore/table/inmem_table.go b/go/libraries/doltcore/table/inmem_table.go index 9af294daf1..0fe65bb8c2 100644 --- a/go/libraries/doltcore/table/inmem_table.go +++ b/go/libraries/doltcore/table/inmem_table.go @@ -19,9 +19,9 @@ import ( "io" "sort" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/store/types" ) // InMemTable holds a simple list of rows that can be retrieved, or appended to. It is meant primarily for testing. diff --git a/go/libraries/doltcore/table/inmem_table_test.go b/go/libraries/doltcore/table/inmem_table_test.go index e900b66d03..1593058903 100644 --- a/go/libraries/doltcore/table/inmem_table_test.go +++ b/go/libraries/doltcore/table/inmem_table_test.go @@ -19,10 +19,10 @@ import ( "io" "testing" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema/typeinfo" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/schema/typeinfo" + "github.com/dolthub/dolt/go/store/types" ) const ( diff --git a/go/libraries/doltcore/table/io.go b/go/libraries/doltcore/table/io.go index b80fdc9996..55c78bbcda 100644 --- a/go/libraries/doltcore/table/io.go +++ b/go/libraries/doltcore/table/io.go @@ -19,8 +19,8 @@ import ( "errors" "io" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" ) // TableReader is an interface for reading rows from a table diff --git a/go/libraries/doltcore/table/pipeline/errors.go b/go/libraries/doltcore/table/pipeline/errors.go index d8188f63e3..7d29d289e7 100644 --- a/go/libraries/doltcore/table/pipeline/errors.go +++ b/go/libraries/doltcore/table/pipeline/errors.go @@ -15,7 +15,7 @@ package pipeline import ( - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/row" ) // TransformRowFailure is an error implementation that stores the row that failed to transform, the transform that diff --git a/go/libraries/doltcore/table/pipeline/errors_test.go b/go/libraries/doltcore/table/pipeline/errors_test.go index 7e32e6a62b..4879a8f65d 100644 --- a/go/libraries/doltcore/table/pipeline/errors_test.go +++ b/go/libraries/doltcore/table/pipeline/errors_test.go @@ -19,9 +19,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/untyped" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/table/untyped" + "github.com/dolthub/dolt/go/store/types" ) func TestTransformRowFailure(t *testing.T) { diff --git a/go/libraries/doltcore/table/pipeline/pipeline.go b/go/libraries/doltcore/table/pipeline/pipeline.go index f84ed1e721..fd99615806 100644 --- a/go/libraries/doltcore/table/pipeline/pipeline.go +++ b/go/libraries/doltcore/table/pipeline/pipeline.go @@ -18,7 +18,7 @@ import ( "sync" "sync/atomic" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/row" ) // Buffer size of processing channels created by the pipeline diff --git a/go/libraries/doltcore/table/pipeline/procfunc_help.go b/go/libraries/doltcore/table/pipeline/procfunc_help.go index 0feccf5814..c0a8c0eb1d 100644 --- a/go/libraries/doltcore/table/pipeline/procfunc_help.go +++ b/go/libraries/doltcore/table/pipeline/procfunc_help.go @@ -19,8 +19,8 @@ import ( "io" "time" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/table" ) // SourceFunc is a function that will return a new row for each successive call until all it's rows are exhausted, at diff --git a/go/libraries/doltcore/table/pipeline/row.go b/go/libraries/doltcore/table/pipeline/row.go index 6a86091cda..f90512e7eb 100644 --- a/go/libraries/doltcore/table/pipeline/row.go +++ b/go/libraries/doltcore/table/pipeline/row.go @@ -14,7 +14,7 @@ package pipeline -import "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" +import "github.com/dolthub/dolt/go/libraries/doltcore/row" // ReadableMap is an interface that provides read only access to map properties type ReadableMap interface { diff --git a/go/libraries/doltcore/table/pipeline/transform.go b/go/libraries/doltcore/table/pipeline/transform.go index 60025b71ce..512dd18999 100644 --- a/go/libraries/doltcore/table/pipeline/transform.go +++ b/go/libraries/doltcore/table/pipeline/transform.go @@ -15,7 +15,7 @@ package pipeline import ( - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/row" ) // NamedTransform is a struct containing a TransformFunc and the name of the transform being applied. If an error occurs diff --git a/go/libraries/doltcore/table/pipeline/transform_test.go b/go/libraries/doltcore/table/pipeline/transform_test.go index 9cdd61e174..7e93abce0d 100644 --- a/go/libraries/doltcore/table/pipeline/transform_test.go +++ b/go/libraries/doltcore/table/pipeline/transform_test.go @@ -26,11 +26,11 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/untyped" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/untyped/csv" - "github.com/liquidata-inc/dolt/go/libraries/utils/iohelp" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/table/untyped" + "github.com/dolthub/dolt/go/libraries/doltcore/table/untyped/csv" + "github.com/dolthub/dolt/go/libraries/utils/iohelp" + "github.com/dolthub/dolt/go/store/types" ) var inCSV = `first,last,film or show,year diff --git a/go/libraries/doltcore/table/read_ahead_table_reader.go b/go/libraries/doltcore/table/read_ahead_table_reader.go index 1700b40292..787c498a95 100644 --- a/go/libraries/doltcore/table/read_ahead_table_reader.go +++ b/go/libraries/doltcore/table/read_ahead_table_reader.go @@ -17,9 +17,9 @@ package table import ( "context" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/utils/async" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/utils/async" ) var _ TableReadCloser = (*AsyncReadAheadTableReader)(nil) diff --git a/go/libraries/doltcore/table/typed/json/reader.go b/go/libraries/doltcore/table/typed/json/reader.go index 97ecb2b367..8e5491992f 100644 --- a/go/libraries/doltcore/table/typed/json/reader.go +++ b/go/libraries/doltcore/table/typed/json/reader.go @@ -22,10 +22,10 @@ import ( "github.com/bcicen/jstream" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/utils/filesys" + "github.com/dolthub/dolt/go/store/types" ) var ReadBufSize = 256 * 1024 diff --git a/go/libraries/doltcore/table/typed/json/reader_test.go b/go/libraries/doltcore/table/typed/json/reader_test.go index 6e06ae6685..7c91813f41 100644 --- a/go/libraries/doltcore/table/typed/json/reader_test.go +++ b/go/libraries/doltcore/table/typed/json/reader_test.go @@ -22,11 +22,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema/typeinfo" - "github.com/liquidata-inc/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/schema/typeinfo" + "github.com/dolthub/dolt/go/libraries/utils/filesys" + "github.com/dolthub/dolt/go/store/types" ) func TestReader(t *testing.T) { diff --git a/go/libraries/doltcore/table/typed/json/writer.go b/go/libraries/doltcore/table/typed/json/writer.go index abaa54f16f..0952142f12 100644 --- a/go/libraries/doltcore/table/typed/json/writer.go +++ b/go/libraries/doltcore/table/typed/json/writer.go @@ -23,13 +23,13 @@ import ( "os" "path/filepath" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema/typeinfo" + "github.com/dolthub/dolt/go/libraries/doltcore/schema/typeinfo" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/dolt/go/libraries/utils/iohelp" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/utils/filesys" + "github.com/dolthub/dolt/go/libraries/utils/iohelp" + "github.com/dolthub/dolt/go/store/types" ) const jsonHeader = `{"rows": [` diff --git a/go/libraries/doltcore/table/typed/noms/noms_map_creator.go b/go/libraries/doltcore/table/typed/noms/noms_map_creator.go index 643e600192..23bad34bef 100644 --- a/go/libraries/doltcore/table/typed/noms/noms_map_creator.go +++ b/go/libraries/doltcore/table/typed/noms/noms_map_creator.go @@ -19,11 +19,11 @@ import ( "errors" "fmt" - "github.com/liquidata-inc/dolt/go/store/atomicerr" + "github.com/dolthub/dolt/go/store/atomicerr" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/store/types" ) // NomsMapUpdater is a TableWriter that creates a new noms types.Map. It is backed by a StreamingMap which requires diff --git a/go/libraries/doltcore/table/typed/noms/noms_map_updater.go b/go/libraries/doltcore/table/typed/noms/noms_map_updater.go index 678ca0ca28..91df04985b 100644 --- a/go/libraries/doltcore/table/typed/noms/noms_map_updater.go +++ b/go/libraries/doltcore/table/typed/noms/noms_map_updater.go @@ -18,11 +18,11 @@ import ( "context" "errors" - "github.com/liquidata-inc/dolt/go/store/atomicerr" + "github.com/dolthub/dolt/go/store/atomicerr" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/store/types" ) type StatsCB func(stats types.AppliedEditStats) diff --git a/go/libraries/doltcore/table/typed/noms/range_reader.go b/go/libraries/doltcore/table/typed/noms/range_reader.go index 3ef19e6825..a983c3a194 100644 --- a/go/libraries/doltcore/table/typed/noms/range_reader.go +++ b/go/libraries/doltcore/table/typed/noms/range_reader.go @@ -18,9 +18,9 @@ import ( "context" "io" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/store/types" ) // InRangeCheck is a call made as the reader reads through values to check that the next value diff --git a/go/libraries/doltcore/table/typed/noms/range_reader_test.go b/go/libraries/doltcore/table/typed/noms/range_reader_test.go index f195801795..d9d6fa6f86 100644 --- a/go/libraries/doltcore/table/typed/noms/range_reader_test.go +++ b/go/libraries/doltcore/table/typed/noms/range_reader_test.go @@ -22,10 +22,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/store/chunks" - "github.com/liquidata-inc/dolt/go/store/datas" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/datas" + "github.com/dolthub/dolt/go/store/types" ) var rangeReaderTests = []struct { diff --git a/go/libraries/doltcore/table/typed/noms/read_write_test.go b/go/libraries/doltcore/table/typed/noms/read_write_test.go index ed1c3509cc..0f5ba09f13 100644 --- a/go/libraries/doltcore/table/typed/noms/read_write_test.go +++ b/go/libraries/doltcore/table/typed/noms/read_write_test.go @@ -21,11 +21,11 @@ import ( "github.com/google/uuid" "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/dbfactory" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/dbfactory" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/table" + "github.com/dolthub/dolt/go/store/types" ) const ( diff --git a/go/libraries/doltcore/table/typed/noms/reader.go b/go/libraries/doltcore/table/typed/noms/reader.go index d95196031f..06e7a60e94 100644 --- a/go/libraries/doltcore/table/typed/noms/reader.go +++ b/go/libraries/doltcore/table/typed/noms/reader.go @@ -18,9 +18,9 @@ import ( "context" "io" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/store/types" ) // NomsMapReader is a TableReader that reads rows from a noms table which is stored in a types.Map where the key is diff --git a/go/libraries/doltcore/table/typed/noms/reader_for_keys.go b/go/libraries/doltcore/table/typed/noms/reader_for_keys.go index 1a0120bcfc..ac418df6a9 100644 --- a/go/libraries/doltcore/table/typed/noms/reader_for_keys.go +++ b/go/libraries/doltcore/table/typed/noms/reader_for_keys.go @@ -18,9 +18,9 @@ import ( "context" "io" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/store/types" ) // KeyIterator is an interface for iterating through a collection of keys diff --git a/go/libraries/doltcore/table/typed/noms/reader_for_keys_test.go b/go/libraries/doltcore/table/typed/noms/reader_for_keys_test.go index 2e55d549ee..a72d56134d 100644 --- a/go/libraries/doltcore/table/typed/noms/reader_for_keys_test.go +++ b/go/libraries/doltcore/table/typed/noms/reader_for_keys_test.go @@ -22,11 +22,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/store/chunks" - "github.com/liquidata-inc/dolt/go/store/datas" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/datas" + "github.com/dolthub/dolt/go/store/types" ) const ( diff --git a/go/libraries/doltcore/table/typed/noms/writer.go b/go/libraries/doltcore/table/typed/noms/writer.go index d7ec7fa957..1ebb069eb0 100644 --- a/go/libraries/doltcore/table/typed/noms/writer.go +++ b/go/libraries/doltcore/table/typed/noms/writer.go @@ -15,8 +15,8 @@ package noms import ( - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/table" + "github.com/dolthub/dolt/go/store/types" ) // NomsMapWriteCloser is a TableWriteCloser where the resulting map that is being written from can be retrieved after diff --git a/go/libraries/doltcore/table/typed/schema.go b/go/libraries/doltcore/table/typed/schema.go index fbb380c6e7..7641a139b4 100644 --- a/go/libraries/doltcore/table/typed/schema.go +++ b/go/libraries/doltcore/table/typed/schema.go @@ -15,7 +15,7 @@ package typed import ( - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" ) func TypedSchemaUnion(schemas ...schema.Schema) (schema.Schema, error) { diff --git a/go/libraries/doltcore/table/untyped/csv/reader.go b/go/libraries/doltcore/table/untyped/csv/reader.go index 1a81fbd2a9..98f3eaee2d 100644 --- a/go/libraries/doltcore/table/untyped/csv/reader.go +++ b/go/libraries/doltcore/table/untyped/csv/reader.go @@ -26,13 +26,13 @@ import ( "unicode" "unicode/utf8" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/untyped" - "github.com/liquidata-inc/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/dolt/go/libraries/utils/iohelp" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/table" + "github.com/dolthub/dolt/go/libraries/doltcore/table/untyped" + "github.com/dolthub/dolt/go/libraries/utils/filesys" + "github.com/dolthub/dolt/go/libraries/utils/iohelp" + "github.com/dolthub/dolt/go/store/types" ) // ReadBufSize is the size of the buffer used when reading the csv file. It is set at the package level and all diff --git a/go/libraries/doltcore/table/untyped/csv/reader_test.go b/go/libraries/doltcore/table/untyped/csv/reader_test.go index e34f3bc6e3..6bed37d6c9 100644 --- a/go/libraries/doltcore/table/untyped/csv/reader_test.go +++ b/go/libraries/doltcore/table/untyped/csv/reader_test.go @@ -20,11 +20,11 @@ import ( "strings" "testing" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/untyped" - "github.com/liquidata-inc/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/table" + "github.com/dolthub/dolt/go/libraries/doltcore/table/untyped" + "github.com/dolthub/dolt/go/libraries/utils/filesys" + "github.com/dolthub/dolt/go/store/types" ) var PersonDB1 = `name, Age, Title diff --git a/go/libraries/doltcore/table/untyped/csv/writer.go b/go/libraries/doltcore/table/untyped/csv/writer.go index 100b58d10e..d1e5aa155a 100644 --- a/go/libraries/doltcore/table/untyped/csv/writer.go +++ b/go/libraries/doltcore/table/untyped/csv/writer.go @@ -25,10 +25,10 @@ import ( "unicode" "unicode/utf8" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/utils/filesys" + "github.com/dolthub/dolt/go/store/types" ) // writeBufSize is the size of the buffer used when writing a csv file. It is set at the package level and all diff --git a/go/libraries/doltcore/table/untyped/csv/writer_test.go b/go/libraries/doltcore/table/untyped/csv/writer_test.go index fc558dc998..445c4d3833 100644 --- a/go/libraries/doltcore/table/untyped/csv/writer_test.go +++ b/go/libraries/doltcore/table/untyped/csv/writer_test.go @@ -18,11 +18,11 @@ import ( "context" "testing" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/untyped" - "github.com/liquidata-inc/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/table/untyped" + "github.com/dolthub/dolt/go/libraries/utils/filesys" + "github.com/dolthub/dolt/go/store/types" ) const ( diff --git a/go/libraries/doltcore/table/untyped/fwt/auto_fwt_transform.go b/go/libraries/doltcore/table/untyped/fwt/auto_fwt_transform.go index 811cb0808d..48fee69577 100644 --- a/go/libraries/doltcore/table/untyped/fwt/auto_fwt_transform.go +++ b/go/libraries/doltcore/table/untyped/fwt/auto_fwt_transform.go @@ -15,9 +15,9 @@ package fwt import ( - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/pipeline" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/table/pipeline" + "github.com/dolthub/dolt/go/store/types" ) // AutoSizingFWTTransformer samples rows to automatically determine maximum column widths to provide to FWTTransformer. diff --git a/go/libraries/doltcore/table/untyped/fwt/auto_fwt_transform_test.go b/go/libraries/doltcore/table/untyped/fwt/auto_fwt_transform_test.go index deadfc896d..72b3f5d83d 100644 --- a/go/libraries/doltcore/table/untyped/fwt/auto_fwt_transform_test.go +++ b/go/libraries/doltcore/table/untyped/fwt/auto_fwt_transform_test.go @@ -19,10 +19,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/pipeline" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/table/pipeline" + "github.com/dolthub/dolt/go/store/types" ) func TestHandleRow(t *testing.T) { diff --git a/go/libraries/doltcore/table/untyped/fwt/fwt_transform.go b/go/libraries/doltcore/table/untyped/fwt/fwt_transform.go index 358fb21746..e9452bed40 100644 --- a/go/libraries/doltcore/table/untyped/fwt/fwt_transform.go +++ b/go/libraries/doltcore/table/untyped/fwt/fwt_transform.go @@ -15,9 +15,9 @@ package fwt import ( - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/pipeline" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/table/pipeline" + "github.com/dolthub/dolt/go/store/types" ) // TooLongBehavior determines how the FWTTransformer should behave when it encounters a column that is longer than what diff --git a/go/libraries/doltcore/table/untyped/fwt/fwtsch.go b/go/libraries/doltcore/table/untyped/fwt/fwtsch.go index 943311dfbc..1af67326c2 100644 --- a/go/libraries/doltcore/table/untyped/fwt/fwtsch.go +++ b/go/libraries/doltcore/table/untyped/fwt/fwtsch.go @@ -17,8 +17,8 @@ package fwt import ( "errors" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/store/types" ) // FWTSchema is a fixed width text schema which includes information on a tables rows, and how wide they should be printed diff --git a/go/libraries/doltcore/table/untyped/fwt/reader.go b/go/libraries/doltcore/table/untyped/fwt/reader.go index 2733d75fc0..61eb3d74bf 100644 --- a/go/libraries/doltcore/table/untyped/fwt/reader.go +++ b/go/libraries/doltcore/table/untyped/fwt/reader.go @@ -22,13 +22,13 @@ import ( "io" "strings" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/untyped" - "github.com/liquidata-inc/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/dolt/go/libraries/utils/iohelp" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/table" + "github.com/dolthub/dolt/go/libraries/doltcore/table/untyped" + "github.com/dolthub/dolt/go/libraries/utils/filesys" + "github.com/dolthub/dolt/go/libraries/utils/iohelp" + "github.com/dolthub/dolt/go/store/types" ) // ReadBufSize is the size of the buffer used when reading the fwt file. It is set at the package level and all diff --git a/go/libraries/doltcore/table/untyped/fwt/reader_test.go b/go/libraries/doltcore/table/untyped/fwt/reader_test.go index 75f3ed0ffc..3162e4359f 100644 --- a/go/libraries/doltcore/table/untyped/fwt/reader_test.go +++ b/go/libraries/doltcore/table/untyped/fwt/reader_test.go @@ -20,11 +20,11 @@ import ( "strings" "testing" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/untyped" - "github.com/liquidata-inc/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/table" + "github.com/dolthub/dolt/go/libraries/doltcore/table/untyped" + "github.com/dolthub/dolt/go/libraries/utils/filesys" + "github.com/dolthub/dolt/go/store/types" ) var PersonDB1 = `Bill Billerson32Senior Dufus diff --git a/go/libraries/doltcore/table/untyped/nullprinter/nullprinter.go b/go/libraries/doltcore/table/untyped/nullprinter/nullprinter.go index cc678a7bc5..d7ad7ae22a 100644 --- a/go/libraries/doltcore/table/untyped/nullprinter/nullprinter.go +++ b/go/libraries/doltcore/table/untyped/nullprinter/nullprinter.go @@ -15,10 +15,10 @@ package nullprinter import ( - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/pipeline" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/table/pipeline" + "github.com/dolthub/dolt/go/store/types" ) const PrintedNull = "" diff --git a/go/libraries/doltcore/table/untyped/sqlexport/sqlwriter.go b/go/libraries/doltcore/table/untyped/sqlexport/sqlwriter.go index eb3480cc5a..b732c473b7 100644 --- a/go/libraries/doltcore/table/untyped/sqlexport/sqlwriter.go +++ b/go/libraries/doltcore/table/untyped/sqlexport/sqlwriter.go @@ -21,14 +21,14 @@ import ( "path/filepath" "strings" - "github.com/liquidata-inc/dolt/go/cmd/dolt/errhand" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - dsqle "github.com/liquidata-inc/dolt/go/libraries/doltcore/sqle" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/sqle/sqlfmt" - "github.com/liquidata-inc/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/dolt/go/libraries/utils/iohelp" + "github.com/dolthub/dolt/go/cmd/dolt/errhand" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + dsqle "github.com/dolthub/dolt/go/libraries/doltcore/sqle" + "github.com/dolthub/dolt/go/libraries/doltcore/sqle/sqlfmt" + "github.com/dolthub/dolt/go/libraries/utils/filesys" + "github.com/dolthub/dolt/go/libraries/utils/iohelp" ) // SqlExportWriter is a TableWriter that writes SQL drop, create and insert statements to re-create a dolt table in a diff --git a/go/libraries/doltcore/table/untyped/sqlexport/sqlwriter_test.go b/go/libraries/doltcore/table/untyped/sqlexport/sqlwriter_test.go index 584f1a2685..eaec40c719 100644 --- a/go/libraries/doltcore/table/untyped/sqlexport/sqlwriter_test.go +++ b/go/libraries/doltcore/table/untyped/sqlexport/sqlwriter_test.go @@ -23,13 +23,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/dtestutils" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema/encoding" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/sqle/sqlfmt" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/dtestutils" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/schema/encoding" + "github.com/dolthub/dolt/go/libraries/doltcore/sqle/sqlfmt" + "github.com/dolthub/dolt/go/store/types" ) type StringBuilderCloser struct { diff --git a/go/libraries/doltcore/table/untyped/tabular/tablewriter.go b/go/libraries/doltcore/table/untyped/tabular/tablewriter.go index f17c60578e..addbe296c6 100644 --- a/go/libraries/doltcore/table/untyped/tabular/tablewriter.go +++ b/go/libraries/doltcore/table/untyped/tabular/tablewriter.go @@ -25,11 +25,11 @@ import ( "github.com/acarl005/stripansi" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/untyped/fwt" - "github.com/liquidata-inc/dolt/go/libraries/utils/iohelp" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/table/untyped/fwt" + "github.com/dolthub/dolt/go/libraries/utils/iohelp" + "github.com/dolthub/dolt/go/store/types" ) const writeBufSize = 256 * 1024 diff --git a/go/libraries/doltcore/table/untyped/tabular/tablewriter_test.go b/go/libraries/doltcore/table/untyped/tabular/tablewriter_test.go index ff558aad83..35c552c5dc 100644 --- a/go/libraries/doltcore/table/untyped/tabular/tablewriter_test.go +++ b/go/libraries/doltcore/table/untyped/tabular/tablewriter_test.go @@ -21,10 +21,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/untyped" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/table/untyped" + "github.com/dolthub/dolt/go/store/types" ) const ( diff --git a/go/libraries/doltcore/table/untyped/untyped_rows.go b/go/libraries/doltcore/table/untyped/untyped_rows.go index 34ac562b3d..5ba98b265a 100644 --- a/go/libraries/doltcore/table/untyped/untyped_rows.go +++ b/go/libraries/doltcore/table/untyped/untyped_rows.go @@ -15,11 +15,11 @@ package untyped import ( - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema/typeinfo" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/typed" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/schema/typeinfo" + "github.com/dolthub/dolt/go/libraries/doltcore/table/typed" + "github.com/dolthub/dolt/go/store/types" ) // NewUntypedSchema takes an array of field names and returns a schema where the fields use the provided names, are of diff --git a/go/libraries/doltcore/table/untyped/untyped_rows_test.go b/go/libraries/doltcore/table/untyped/untyped_rows_test.go index 034965dd81..6d8f6f5944 100644 --- a/go/libraries/doltcore/table/untyped/untyped_rows_test.go +++ b/go/libraries/doltcore/table/untyped/untyped_rows_test.go @@ -19,8 +19,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/store/types" ) func TestNewUntypedSchema(t *testing.T) { diff --git a/go/libraries/doltcore/table/untyped/xlsx/marshaling.go b/go/libraries/doltcore/table/untyped/xlsx/marshaling.go index 0edf3108a2..e873f1ae46 100644 --- a/go/libraries/doltcore/table/untyped/xlsx/marshaling.go +++ b/go/libraries/doltcore/table/untyped/xlsx/marshaling.go @@ -21,9 +21,9 @@ import ( "github.com/tealeg/xlsx" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/store/types" ) func UnmarshalFromXLSX(path string) ([][][]string, error) { diff --git a/go/libraries/doltcore/table/untyped/xlsx/marshaling_test.go b/go/libraries/doltcore/table/untyped/xlsx/marshaling_test.go index 52f748c8ae..aca572ac28 100644 --- a/go/libraries/doltcore/table/untyped/xlsx/marshaling_test.go +++ b/go/libraries/doltcore/table/untyped/xlsx/marshaling_test.go @@ -21,10 +21,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema/typeinfo" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/untyped" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema/typeinfo" + "github.com/dolthub/dolt/go/libraries/doltcore/table/untyped" + "github.com/dolthub/dolt/go/store/types" ) func TestDecodeXLSXRows(t *testing.T) { diff --git a/go/libraries/doltcore/table/untyped/xlsx/reader.go b/go/libraries/doltcore/table/untyped/xlsx/reader.go index 59363bd977..4e1659e0c7 100644 --- a/go/libraries/doltcore/table/untyped/xlsx/reader.go +++ b/go/libraries/doltcore/table/untyped/xlsx/reader.go @@ -20,11 +20,11 @@ import ( "errors" "io" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/untyped" - "github.com/liquidata-inc/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/doltcore/row" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/libraries/doltcore/table/untyped" + "github.com/dolthub/dolt/go/libraries/utils/filesys" + "github.com/dolthub/dolt/go/store/types" ) var ReadBufSize = 256 * 1024 diff --git a/go/libraries/events/collector.go b/go/libraries/events/collector.go index 3d41166c69..07f607eaa0 100644 --- a/go/libraries/events/collector.go +++ b/go/libraries/events/collector.go @@ -20,7 +20,7 @@ import ( "github.com/denisbrodbeck/machineid" - eventsapi "github.com/liquidata-inc/dolt/go/gen/proto/dolt/services/eventsapi/v1alpha1" + eventsapi "github.com/dolthub/dolt/go/gen/proto/dolt/services/eventsapi/v1alpha1" ) var machineID = "invalid" diff --git a/go/libraries/events/emitter.go b/go/libraries/events/emitter.go index 68ae1d2d05..19510b19fa 100644 --- a/go/libraries/events/emitter.go +++ b/go/libraries/events/emitter.go @@ -25,9 +25,9 @@ import ( "github.com/golang/protobuf/proto" "google.golang.org/grpc" - eventsapi "github.com/liquidata-inc/dolt/go/gen/proto/dolt/services/eventsapi/v1alpha1" - "github.com/liquidata-inc/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/dolt/go/libraries/utils/iohelp" + eventsapi "github.com/dolthub/dolt/go/gen/proto/dolt/services/eventsapi/v1alpha1" + "github.com/dolthub/dolt/go/libraries/utils/filesys" + "github.com/dolthub/dolt/go/libraries/utils/iohelp" ) // Emitter is an interface used for processing a batch of events diff --git a/go/libraries/events/event_flush.go b/go/libraries/events/event_flush.go index d470422064..8b176ee86b 100644 --- a/go/libraries/events/event_flush.go +++ b/go/libraries/events/event_flush.go @@ -23,8 +23,8 @@ import ( "github.com/golang/protobuf/proto" "github.com/juju/fslock" - eventsapi "github.com/liquidata-inc/dolt/go/gen/proto/dolt/services/eventsapi/v1alpha1" - "github.com/liquidata-inc/dolt/go/libraries/utils/filesys" + eventsapi "github.com/dolthub/dolt/go/gen/proto/dolt/services/eventsapi/v1alpha1" + "github.com/dolthub/dolt/go/libraries/utils/filesys" ) var ( diff --git a/go/libraries/events/event_flush_test.go b/go/libraries/events/event_flush_test.go index 2e72645d74..b7821473c2 100644 --- a/go/libraries/events/event_flush_test.go +++ b/go/libraries/events/event_flush_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/assert" "google.golang.org/grpc" - eventsapi "github.com/liquidata-inc/dolt/go/gen/proto/dolt/services/eventsapi/v1alpha1" - "github.com/liquidata-inc/dolt/go/libraries/utils/filesys" - testLib "github.com/liquidata-inc/dolt/go/libraries/utils/test" + eventsapi "github.com/dolthub/dolt/go/gen/proto/dolt/services/eventsapi/v1alpha1" + "github.com/dolthub/dolt/go/libraries/utils/filesys" + testLib "github.com/dolthub/dolt/go/libraries/utils/test" ) var ( diff --git a/go/libraries/events/events.go b/go/libraries/events/events.go index 5549ff36bc..998343cbd6 100644 --- a/go/libraries/events/events.go +++ b/go/libraries/events/events.go @@ -22,7 +22,7 @@ import ( "github.com/golang/protobuf/ptypes/timestamp" "github.com/google/uuid" - eventsapi "github.com/liquidata-inc/dolt/go/gen/proto/dolt/services/eventsapi/v1alpha1" + eventsapi "github.com/dolthub/dolt/go/gen/proto/dolt/services/eventsapi/v1alpha1" ) // EventNowFunc function is used to get the current time and can be overridden for testing. diff --git a/go/libraries/events/events_test.go b/go/libraries/events/events_test.go index 7202d3bca5..50066979b1 100644 --- a/go/libraries/events/events_test.go +++ b/go/libraries/events/events_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" - eventsapi "github.com/liquidata-inc/dolt/go/gen/proto/dolt/services/eventsapi/v1alpha1" + eventsapi "github.com/dolthub/dolt/go/gen/proto/dolt/services/eventsapi/v1alpha1" ) func TestEvents(t *testing.T) { diff --git a/go/libraries/events/file_backed_proc.go b/go/libraries/events/file_backed_proc.go index df946a2b07..c550f0bc69 100644 --- a/go/libraries/events/file_backed_proc.go +++ b/go/libraries/events/file_backed_proc.go @@ -25,9 +25,9 @@ import ( "github.com/golang/protobuf/proto" - eventsapi "github.com/liquidata-inc/dolt/go/gen/proto/dolt/services/eventsapi/v1alpha1" - filesys "github.com/liquidata-inc/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/dolt/go/libraries/utils/iohelp" + eventsapi "github.com/dolthub/dolt/go/gen/proto/dolt/services/eventsapi/v1alpha1" + filesys "github.com/dolthub/dolt/go/libraries/utils/filesys" + "github.com/dolthub/dolt/go/libraries/utils/iohelp" ) const ( diff --git a/go/libraries/events/file_backed_proc_test.go b/go/libraries/events/file_backed_proc_test.go index 82bd655b77..788f6b4bae 100644 --- a/go/libraries/events/file_backed_proc_test.go +++ b/go/libraries/events/file_backed_proc_test.go @@ -22,8 +22,8 @@ import ( "github.com/golang/protobuf/proto" "github.com/stretchr/testify/assert" - eventsapi "github.com/liquidata-inc/dolt/go/gen/proto/dolt/services/eventsapi/v1alpha1" - "github.com/liquidata-inc/dolt/go/libraries/utils/filesys" + eventsapi "github.com/dolthub/dolt/go/gen/proto/dolt/services/eventsapi/v1alpha1" + "github.com/dolthub/dolt/go/libraries/utils/filesys" ) type SequentialNamer struct { diff --git a/go/libraries/events/metrics.go b/go/libraries/events/metrics.go index a965f6e51f..369eb82ebb 100644 --- a/go/libraries/events/metrics.go +++ b/go/libraries/events/metrics.go @@ -20,7 +20,7 @@ import ( "github.com/golang/protobuf/ptypes" - eventsapi "github.com/liquidata-inc/dolt/go/gen/proto/dolt/services/eventsapi/v1alpha1" + eventsapi "github.com/dolthub/dolt/go/gen/proto/dolt/services/eventsapi/v1alpha1" ) // EventMetric is an interface for getting the eventsapi.ClientEventMetric encoding of a metric diff --git a/go/libraries/events/metrics_test.go b/go/libraries/events/metrics_test.go index 488909f43a..c9f684dc5a 100644 --- a/go/libraries/events/metrics_test.go +++ b/go/libraries/events/metrics_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" - eventsapi "github.com/liquidata-inc/dolt/go/gen/proto/dolt/services/eventsapi/v1alpha1" + eventsapi "github.com/dolthub/dolt/go/gen/proto/dolt/services/eventsapi/v1alpha1" ) func TestCounterAtomicity(t *testing.T) { diff --git a/go/libraries/utils/argparser/results.go b/go/libraries/utils/argparser/results.go index a712dc29cb..2ab458bcfe 100644 --- a/go/libraries/utils/argparser/results.go +++ b/go/libraries/utils/argparser/results.go @@ -18,7 +18,7 @@ import ( "math" "strconv" - "github.com/liquidata-inc/dolt/go/libraries/utils/set" + "github.com/dolthub/dolt/go/libraries/utils/set" ) type ArgParseResults struct { diff --git a/go/libraries/utils/config/file_config.go b/go/libraries/utils/config/file_config.go index eb2b310f7e..cf5ce5ebf8 100644 --- a/go/libraries/utils/config/file_config.go +++ b/go/libraries/utils/config/file_config.go @@ -19,7 +19,7 @@ import ( "errors" "path/filepath" - "github.com/liquidata-inc/dolt/go/libraries/utils/filesys" + "github.com/dolthub/dolt/go/libraries/utils/filesys" ) // FileConfig is backed by a file in the filesystem. diff --git a/go/libraries/utils/config/file_config_test.go b/go/libraries/utils/config/file_config_test.go index 90e7d35b58..350b5f2836 100644 --- a/go/libraries/utils/config/file_config_test.go +++ b/go/libraries/utils/config/file_config_test.go @@ -17,7 +17,7 @@ package config import ( "testing" - "github.com/liquidata-inc/dolt/go/libraries/utils/filesys" + "github.com/dolthub/dolt/go/libraries/utils/filesys" ) const ( diff --git a/go/libraries/utils/earl/url.go b/go/libraries/utils/earl/url.go index 274ba52877..85f0b573bc 100644 --- a/go/libraries/utils/earl/url.go +++ b/go/libraries/utils/earl/url.go @@ -20,7 +20,7 @@ import ( "strconv" "strings" - "github.com/liquidata-inc/dolt/go/libraries/utils/osutil" + "github.com/dolthub/dolt/go/libraries/utils/osutil" ) var validHostRegex = regexp.MustCompile("^[-.a-zA-z0-9]*$") diff --git a/go/libraries/utils/editor/edit_test.go b/go/libraries/utils/editor/edit_test.go index 80ba9f6a2c..ae128abaf0 100644 --- a/go/libraries/utils/editor/edit_test.go +++ b/go/libraries/utils/editor/edit_test.go @@ -18,7 +18,7 @@ import ( "reflect" "testing" - "github.com/liquidata-inc/dolt/go/libraries/utils/osutil" + "github.com/dolthub/dolt/go/libraries/utils/osutil" ) func TestGetCmdNameAndArgsForEditor(t *testing.T) { diff --git a/go/libraries/utils/filesys/fs_test.go b/go/libraries/utils/filesys/fs_test.go index 59d903f20a..ecc6c27105 100644 --- a/go/libraries/utils/filesys/fs_test.go +++ b/go/libraries/utils/filesys/fs_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/libraries/utils/osutil" - "github.com/liquidata-inc/dolt/go/libraries/utils/test" + "github.com/dolthub/dolt/go/libraries/utils/osutil" + "github.com/dolthub/dolt/go/libraries/utils/test" ) const ( diff --git a/go/libraries/utils/filesys/inmemfs.go b/go/libraries/utils/filesys/inmemfs.go index 6defdadfd0..5b04570d6b 100644 --- a/go/libraries/utils/filesys/inmemfs.go +++ b/go/libraries/utils/filesys/inmemfs.go @@ -25,8 +25,8 @@ import ( "sync" "time" - "github.com/liquidata-inc/dolt/go/libraries/utils/iohelp" - "github.com/liquidata-inc/dolt/go/libraries/utils/osutil" + "github.com/dolthub/dolt/go/libraries/utils/iohelp" + "github.com/dolthub/dolt/go/libraries/utils/osutil" ) // InMemNowFunc is a func() time.Time that can be used to supply the current time. The default value gets the current diff --git a/go/libraries/utils/iohelp/read_test.go b/go/libraries/utils/iohelp/read_test.go index 066b86848a..433a5f731c 100644 --- a/go/libraries/utils/iohelp/read_test.go +++ b/go/libraries/utils/iohelp/read_test.go @@ -25,9 +25,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/libraries/utils/mathutil" - "github.com/liquidata-inc/dolt/go/libraries/utils/osutil" - "github.com/liquidata-inc/dolt/go/libraries/utils/test" + "github.com/dolthub/dolt/go/libraries/utils/mathutil" + "github.com/dolthub/dolt/go/libraries/utils/osutil" + "github.com/dolthub/dolt/go/libraries/utils/test" ) func TestErrPreservingReader(t *testing.T) { diff --git a/go/libraries/utils/iohelp/write_test.go b/go/libraries/utils/iohelp/write_test.go index f0698fced8..8e7c09dcbd 100644 --- a/go/libraries/utils/iohelp/write_test.go +++ b/go/libraries/utils/iohelp/write_test.go @@ -19,7 +19,7 @@ import ( "reflect" "testing" - "github.com/liquidata-inc/dolt/go/libraries/utils/test" + "github.com/dolthub/dolt/go/libraries/utils/test" ) type test16ByteWriter struct { diff --git a/go/libraries/utils/pantoerr/panic_utils.go b/go/libraries/utils/pantoerr/panic_utils.go index 37537d2db3..0a7a8d8630 100644 --- a/go/libraries/utils/pantoerr/panic_utils.go +++ b/go/libraries/utils/pantoerr/panic_utils.go @@ -14,7 +14,7 @@ package pantoerr -import "github.com/liquidata-inc/dolt/go/store/d" +import "github.com/dolthub/dolt/go/store/d" // RecoverPanic is used to convert panics to errors. The attic-labs noms codebase loves to panic. This is not // idiomatic for Go code. RecoverPanic wraps the cause of the panic retrieved from the recover call, and implements diff --git a/go/libraries/utils/valutil/values.go b/go/libraries/utils/valutil/values.go index ae17a145f8..a3e65a7209 100644 --- a/go/libraries/utils/valutil/values.go +++ b/go/libraries/utils/valutil/values.go @@ -15,7 +15,7 @@ package valutil import ( - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) // NilSafeEqCheck compares two types.Value instances in a manner that handles nils as equal to types.NullValue diff --git a/go/libraries/utils/valutil/values_test.go b/go/libraries/utils/valutil/values_test.go index 5d8f2e33a5..825b4c290c 100644 --- a/go/libraries/utils/valutil/values_test.go +++ b/go/libraries/utils/valutil/values_test.go @@ -17,7 +17,7 @@ package valutil import ( "testing" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) func TestNilSafeEqCheck(t *testing.T) { diff --git a/go/performance/benchmarks/benchmarks.go b/go/performance/benchmarks/benchmarks.go index 0d9563dcd2..6e5ee55687 100644 --- a/go/performance/benchmarks/benchmarks.go +++ b/go/performance/benchmarks/benchmarks.go @@ -23,14 +23,14 @@ import ( "path/filepath" "testing" - "github.com/liquidata-inc/dolt/go/cmd/dolt/commands" - "github.com/liquidata-inc/dolt/go/cmd/dolt/commands/tblcmds" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/dbfactory" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/dolt/go/libraries/utils/test" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/cmd/dolt/commands" + "github.com/dolthub/dolt/go/cmd/dolt/commands/tblcmds" + "github.com/dolthub/dolt/go/libraries/doltcore/dbfactory" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" + "github.com/dolthub/dolt/go/libraries/doltcore/env" + "github.com/dolthub/dolt/go/libraries/utils/filesys" + "github.com/dolthub/dolt/go/libraries/utils/test" + "github.com/dolthub/dolt/go/store/types" ) const ( diff --git a/go/performance/benchmarks/helpers.go b/go/performance/benchmarks/helpers.go index c11906b1b6..19ecbacf3f 100644 --- a/go/performance/benchmarks/helpers.go +++ b/go/performance/benchmarks/helpers.go @@ -21,9 +21,9 @@ import ( "strconv" "strings" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema/typeinfo" + "github.com/dolthub/dolt/go/libraries/doltcore/schema/typeinfo" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) type seedFunc func(col *SeedColumn, format string) string diff --git a/go/performance/benchmarks/main.go b/go/performance/benchmarks/main.go index 5311cba096..b9768dc448 100644 --- a/go/performance/benchmarks/main.go +++ b/go/performance/benchmarks/main.go @@ -20,7 +20,7 @@ import ( "os" "testing" - "github.com/liquidata-inc/dolt/go/libraries/utils/filesys" + "github.com/dolthub/dolt/go/libraries/utils/filesys" ) const ( diff --git a/go/performance/benchmarks/results.go b/go/performance/benchmarks/results.go index acf26b3fea..a4cb257348 100644 --- a/go/performance/benchmarks/results.go +++ b/go/performance/benchmarks/results.go @@ -23,8 +23,8 @@ import ( "testing" "time" - "github.com/liquidata-inc/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/utils/filesys" + "github.com/dolthub/dolt/go/store/types" ) type result struct { diff --git a/go/performance/benchmarks/seed_schema.go b/go/performance/benchmarks/seed_schema.go index 2d6c56a38d..ca12debcd4 100644 --- a/go/performance/benchmarks/seed_schema.go +++ b/go/performance/benchmarks/seed_schema.go @@ -19,7 +19,7 @@ import ( "log" "strings" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) const ( diff --git a/go/store/blobstore/local.go b/go/store/blobstore/local.go index 0ef42542f4..30bbb28044 100644 --- a/go/store/blobstore/local.go +++ b/go/store/blobstore/local.go @@ -22,7 +22,7 @@ import ( "os" "path/filepath" - "github.com/liquidata-inc/dolt/go/store/util/tempfiles" + "github.com/dolthub/dolt/go/store/util/tempfiles" "github.com/google/uuid" "github.com/juju/fslock" diff --git a/go/store/chunks/chunk.go b/go/store/chunks/chunk.go index 3de7570d60..63e920369a 100644 --- a/go/store/chunks/chunk.go +++ b/go/store/chunks/chunk.go @@ -25,8 +25,8 @@ package chunks import ( "bytes" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/hash" ) // Chunk is a unit of stored data in noms diff --git a/go/store/chunks/chunk_serializer.go b/go/store/chunks/chunk_serializer.go index 33238305cf..44c3fde409 100644 --- a/go/store/chunks/chunk_serializer.go +++ b/go/store/chunks/chunk_serializer.go @@ -26,8 +26,8 @@ import ( "encoding/binary" "io" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/hash" ) /* diff --git a/go/store/chunks/chunk_store.go b/go/store/chunks/chunk_store.go index b0cfd0881b..a3edc7c1ba 100644 --- a/go/store/chunks/chunk_store.go +++ b/go/store/chunks/chunk_store.go @@ -25,7 +25,7 @@ import ( "context" "io" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/hash" ) // ChunkStore is the core storage abstraction in noms. We can put data diff --git a/go/store/chunks/chunk_store_common_test.go b/go/store/chunks/chunk_store_common_test.go index 85dac62733..8608e6f9a3 100644 --- a/go/store/chunks/chunk_store_common_test.go +++ b/go/store/chunks/chunk_store_common_test.go @@ -26,8 +26,8 @@ import ( "github.com/stretchr/testify/suite" - "github.com/liquidata-inc/dolt/go/store/constants" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/constants" + "github.com/dolthub/dolt/go/store/hash" ) type ChunkStoreTestSuite struct { diff --git a/go/store/chunks/cs_metrics_wrapper.go b/go/store/chunks/cs_metrics_wrapper.go index ac97cd8c35..c559599506 100644 --- a/go/store/chunks/cs_metrics_wrapper.go +++ b/go/store/chunks/cs_metrics_wrapper.go @@ -19,7 +19,7 @@ import ( "fmt" "sync/atomic" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/hash" ) // CSMetrics contains the metrics aggregated by a CSMetricsWrapper diff --git a/go/store/chunks/memory_store.go b/go/store/chunks/memory_store.go index cdcfa16a91..6a6930a9a7 100644 --- a/go/store/chunks/memory_store.go +++ b/go/store/chunks/memory_store.go @@ -25,10 +25,10 @@ import ( "context" "sync" - "github.com/liquidata-inc/dolt/go/store/constants" + "github.com/dolthub/dolt/go/store/constants" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/hash" ) // MemoryStorage provides a "persistent" storage layer to back multiple diff --git a/go/store/chunks/remote_requests.go b/go/store/chunks/remote_requests.go index 78e5b1d651..77849c4c77 100644 --- a/go/store/chunks/remote_requests.go +++ b/go/store/chunks/remote_requests.go @@ -24,7 +24,7 @@ package chunks import ( "sync" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/hash" ) type ReadRequest interface { diff --git a/go/store/chunks/remote_requests_test.go b/go/store/chunks/remote_requests_test.go index 520b6787c0..aea3b82898 100644 --- a/go/store/chunks/remote_requests_test.go +++ b/go/store/chunks/remote_requests_test.go @@ -27,7 +27,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/hash" ) func TestGetRequestBatch(t *testing.T) { diff --git a/go/store/chunks/test_utils.go b/go/store/chunks/test_utils.go index 1c1c3df835..0799c1f541 100644 --- a/go/store/chunks/test_utils.go +++ b/go/store/chunks/test_utils.go @@ -27,8 +27,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/hash" ) func assertInputInStore(input string, h hash.Hash, s ChunkStore, assert *assert.Assertions) { diff --git a/go/store/cmd/noms/commit_iterator.go b/go/store/cmd/noms/commit_iterator.go index cf93f5705d..7c10176fd7 100644 --- a/go/store/cmd/noms/commit_iterator.go +++ b/go/store/cmd/noms/commit_iterator.go @@ -25,10 +25,10 @@ import ( "context" "fmt" - "github.com/liquidata-inc/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/datas" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/datas" + "github.com/dolthub/dolt/go/store/types" ) type CommitIterator struct { diff --git a/go/store/cmd/noms/noms.go b/go/store/cmd/noms/noms.go index 6840bbb16a..5cbb1a78a4 100644 --- a/go/store/cmd/noms/noms.go +++ b/go/store/cmd/noms/noms.go @@ -33,10 +33,10 @@ import ( "github.com/attic-labs/kingpin" flag "github.com/juju/gnuflag" - "github.com/liquidata-inc/dolt/go/store/cmd/noms/util" - "github.com/liquidata-inc/dolt/go/store/util/exit" - "github.com/liquidata-inc/dolt/go/store/util/profile" - "github.com/liquidata-inc/dolt/go/store/util/verbose" + "github.com/dolthub/dolt/go/store/cmd/noms/util" + "github.com/dolthub/dolt/go/store/util/exit" + "github.com/dolthub/dolt/go/store/util/profile" + "github.com/dolthub/dolt/go/store/util/verbose" ) var commands = []*util.Command{ diff --git a/go/store/cmd/noms/noms_blob.go b/go/store/cmd/noms/noms_blob.go index d6629d02c9..93e29618e9 100644 --- a/go/store/cmd/noms/noms_blob.go +++ b/go/store/cmd/noms/noms_blob.go @@ -28,8 +28,8 @@ import ( "github.com/attic-labs/kingpin" - "github.com/liquidata-inc/dolt/go/store/cmd/noms/util" - "github.com/liquidata-inc/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/cmd/noms/util" + "github.com/dolthub/dolt/go/store/d" ) func nomsBlob(ctx context.Context, noms *kingpin.Application) (*kingpin.CmdClause, util.KingpinHandler) { diff --git a/go/store/cmd/noms/noms_blob_get.go b/go/store/cmd/noms/noms_blob_get.go index c11472aacf..2c23a5f69a 100644 --- a/go/store/cmd/noms/noms_blob_get.go +++ b/go/store/cmd/noms/noms_blob_get.go @@ -30,12 +30,12 @@ import ( humanize "github.com/dustin/go-humanize" - "github.com/liquidata-inc/dolt/go/store/cmd/noms/util" - "github.com/liquidata-inc/dolt/go/store/config" - "github.com/liquidata-inc/dolt/go/store/types" - "github.com/liquidata-inc/dolt/go/store/util/profile" - "github.com/liquidata-inc/dolt/go/store/util/progressreader" - "github.com/liquidata-inc/dolt/go/store/util/status" + "github.com/dolthub/dolt/go/store/cmd/noms/util" + "github.com/dolthub/dolt/go/store/config" + "github.com/dolthub/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/util/profile" + "github.com/dolthub/dolt/go/store/util/progressreader" + "github.com/dolthub/dolt/go/store/util/status" ) func nomsBlobGet(ctx context.Context, ds string, filePath string) int { diff --git a/go/store/cmd/noms/noms_blob_get_test.go b/go/store/cmd/noms/noms_blob_get_test.go index 18b6560764..c5da1e1e7f 100644 --- a/go/store/cmd/noms/noms_blob_get_test.go +++ b/go/store/cmd/noms/noms_blob_get_test.go @@ -31,9 +31,9 @@ import ( "github.com/stretchr/testify/suite" - "github.com/liquidata-inc/dolt/go/store/spec" - "github.com/liquidata-inc/dolt/go/store/types" - "github.com/liquidata-inc/dolt/go/store/util/clienttest" + "github.com/dolthub/dolt/go/store/spec" + "github.com/dolthub/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/util/clienttest" ) func TestNomsBlobGet(t *testing.T) { diff --git a/go/store/cmd/noms/noms_blob_put.go b/go/store/cmd/noms/noms_blob_put.go index 2fccb16ef3..f48cd677fe 100644 --- a/go/store/cmd/noms/noms_blob_put.go +++ b/go/store/cmd/noms/noms_blob_put.go @@ -28,11 +28,11 @@ import ( "io" "os" - "github.com/liquidata-inc/dolt/go/store/cmd/noms/util" - "github.com/liquidata-inc/dolt/go/store/config" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/types" - "github.com/liquidata-inc/dolt/go/store/util/profile" + "github.com/dolthub/dolt/go/store/cmd/noms/util" + "github.com/dolthub/dolt/go/store/config" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/util/profile" ) func nomsBlobPut(ctx context.Context, filePath string, dsPath string, concurrency int) int { diff --git a/go/store/cmd/noms/noms_cat.go b/go/store/cmd/noms/noms_cat.go index 6501fa00e2..23737fb557 100644 --- a/go/store/cmd/noms/noms_cat.go +++ b/go/store/cmd/noms/noms_cat.go @@ -30,11 +30,11 @@ import ( "github.com/golang/snappy" flag "github.com/juju/gnuflag" - "github.com/liquidata-inc/dolt/go/store/chunks" - "github.com/liquidata-inc/dolt/go/store/cmd/noms/util" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/spec" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/cmd/noms/util" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/spec" + "github.com/dolthub/dolt/go/store/types" ) const ( diff --git a/go/store/cmd/noms/noms_commit.go b/go/store/cmd/noms/noms_commit.go index 043c3d4e53..93e1f7a5c0 100644 --- a/go/store/cmd/noms/noms_commit.go +++ b/go/store/cmd/noms/noms_commit.go @@ -30,12 +30,12 @@ import ( flag "github.com/juju/gnuflag" - "github.com/liquidata-inc/dolt/go/store/cmd/noms/util" - "github.com/liquidata-inc/dolt/go/store/config" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/datas" - "github.com/liquidata-inc/dolt/go/store/spec" - "github.com/liquidata-inc/dolt/go/store/util/verbose" + "github.com/dolthub/dolt/go/store/cmd/noms/util" + "github.com/dolthub/dolt/go/store/config" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/datas" + "github.com/dolthub/dolt/go/store/spec" + "github.com/dolthub/dolt/go/store/util/verbose" ) var allowDupe bool diff --git a/go/store/cmd/noms/noms_commit_test.go b/go/store/cmd/noms/noms_commit_test.go index 0e62b31e8a..5c63bc79d6 100644 --- a/go/store/cmd/noms/noms_commit_test.go +++ b/go/store/cmd/noms/noms_commit_test.go @@ -28,11 +28,11 @@ import ( "github.com/stretchr/testify/suite" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/datas" - "github.com/liquidata-inc/dolt/go/store/spec" - "github.com/liquidata-inc/dolt/go/store/types" - "github.com/liquidata-inc/dolt/go/store/util/clienttest" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/datas" + "github.com/dolthub/dolt/go/store/spec" + "github.com/dolthub/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/util/clienttest" ) type nomsCommitTestSuite struct { diff --git a/go/store/cmd/noms/noms_config.go b/go/store/cmd/noms/noms_config.go index 571a382239..b51fafa92f 100644 --- a/go/store/cmd/noms/noms_config.go +++ b/go/store/cmd/noms/noms_config.go @@ -28,8 +28,8 @@ import ( flag "github.com/juju/gnuflag" - "github.com/liquidata-inc/dolt/go/store/cmd/noms/util" - "github.com/liquidata-inc/dolt/go/store/config" + "github.com/dolthub/dolt/go/store/cmd/noms/util" + "github.com/dolthub/dolt/go/store/config" ) var nomsConfig = &util.Command{ diff --git a/go/store/cmd/noms/noms_diff.go b/go/store/cmd/noms/noms_diff.go index 40db48dbfe..ee67559758 100644 --- a/go/store/cmd/noms/noms_diff.go +++ b/go/store/cmd/noms/noms_diff.go @@ -27,12 +27,12 @@ import ( flag "github.com/juju/gnuflag" - "github.com/liquidata-inc/dolt/go/store/cmd/noms/util" - "github.com/liquidata-inc/dolt/go/store/config" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/diff" - "github.com/liquidata-inc/dolt/go/store/util/outputpager" - "github.com/liquidata-inc/dolt/go/store/util/verbose" + "github.com/dolthub/dolt/go/store/cmd/noms/util" + "github.com/dolthub/dolt/go/store/config" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/diff" + "github.com/dolthub/dolt/go/store/util/outputpager" + "github.com/dolthub/dolt/go/store/util/verbose" ) var stat bool diff --git a/go/store/cmd/noms/noms_diff_test.go b/go/store/cmd/noms/noms_diff_test.go index a9945792eb..8f374bc7c6 100644 --- a/go/store/cmd/noms/noms_diff_test.go +++ b/go/store/cmd/noms/noms_diff_test.go @@ -28,9 +28,9 @@ import ( "github.com/stretchr/testify/suite" - "github.com/liquidata-inc/dolt/go/store/spec" - "github.com/liquidata-inc/dolt/go/store/types" - "github.com/liquidata-inc/dolt/go/store/util/clienttest" + "github.com/dolthub/dolt/go/store/spec" + "github.com/dolthub/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/util/clienttest" ) type nomsDiffTestSuite struct { diff --git a/go/store/cmd/noms/noms_ds.go b/go/store/cmd/noms/noms_ds.go index 7a59bd5037..7e4acda088 100644 --- a/go/store/cmd/noms/noms_ds.go +++ b/go/store/cmd/noms/noms_ds.go @@ -28,11 +28,11 @@ import ( flag "github.com/juju/gnuflag" - "github.com/liquidata-inc/dolt/go/store/cmd/noms/util" - "github.com/liquidata-inc/dolt/go/store/config" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/types" - "github.com/liquidata-inc/dolt/go/store/util/verbose" + "github.com/dolthub/dolt/go/store/cmd/noms/util" + "github.com/dolthub/dolt/go/store/config" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/util/verbose" ) var toDelete string diff --git a/go/store/cmd/noms/noms_ds_test.go b/go/store/cmd/noms/noms_ds_test.go index a27dd7d58f..d787d3d872 100644 --- a/go/store/cmd/noms/noms_ds_test.go +++ b/go/store/cmd/noms/noms_ds_test.go @@ -27,11 +27,11 @@ import ( "github.com/stretchr/testify/suite" - "github.com/liquidata-inc/dolt/go/store/datas" - "github.com/liquidata-inc/dolt/go/store/nbs" - "github.com/liquidata-inc/dolt/go/store/spec" - "github.com/liquidata-inc/dolt/go/store/types" - "github.com/liquidata-inc/dolt/go/store/util/clienttest" + "github.com/dolthub/dolt/go/store/datas" + "github.com/dolthub/dolt/go/store/nbs" + "github.com/dolthub/dolt/go/store/spec" + "github.com/dolthub/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/util/clienttest" ) func TestDs(t *testing.T) { diff --git a/go/store/cmd/noms/noms_list.go b/go/store/cmd/noms/noms_list.go index 4eb08197d4..c0fd02983a 100644 --- a/go/store/cmd/noms/noms_list.go +++ b/go/store/cmd/noms/noms_list.go @@ -27,12 +27,12 @@ import ( "github.com/attic-labs/kingpin" - "github.com/liquidata-inc/dolt/go/store/cmd/noms/util" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/datas" - "github.com/liquidata-inc/dolt/go/store/diff" - "github.com/liquidata-inc/dolt/go/store/spec" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/cmd/noms/util" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/datas" + "github.com/dolthub/dolt/go/store/diff" + "github.com/dolthub/dolt/go/store/spec" + "github.com/dolthub/dolt/go/store/types" ) func nomsList(ctx context.Context, noms *kingpin.Application) (*kingpin.CmdClause, util.KingpinHandler) { diff --git a/go/store/cmd/noms/noms_log.go b/go/store/cmd/noms/noms_log.go index 1da529ac91..cdf03257d0 100644 --- a/go/store/cmd/noms/noms_log.go +++ b/go/store/cmd/noms/noms_log.go @@ -35,18 +35,18 @@ import ( flag "github.com/juju/gnuflag" "github.com/mgutz/ansi" - "github.com/liquidata-inc/dolt/go/store/cmd/noms/util" - "github.com/liquidata-inc/dolt/go/store/config" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/datas" - "github.com/liquidata-inc/dolt/go/store/diff" - "github.com/liquidata-inc/dolt/go/store/spec" - "github.com/liquidata-inc/dolt/go/store/types" - "github.com/liquidata-inc/dolt/go/store/util/datetime" - "github.com/liquidata-inc/dolt/go/store/util/functions" - "github.com/liquidata-inc/dolt/go/store/util/outputpager" - "github.com/liquidata-inc/dolt/go/store/util/verbose" - "github.com/liquidata-inc/dolt/go/store/util/writers" + "github.com/dolthub/dolt/go/store/cmd/noms/util" + "github.com/dolthub/dolt/go/store/config" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/datas" + "github.com/dolthub/dolt/go/store/diff" + "github.com/dolthub/dolt/go/store/spec" + "github.com/dolthub/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/util/datetime" + "github.com/dolthub/dolt/go/store/util/functions" + "github.com/dolthub/dolt/go/store/util/outputpager" + "github.com/dolthub/dolt/go/store/util/verbose" + "github.com/dolthub/dolt/go/store/util/writers" ) var ( diff --git a/go/store/cmd/noms/noms_log_test.go b/go/store/cmd/noms/noms_log_test.go index c2875910b2..640d53ea42 100644 --- a/go/store/cmd/noms/noms_log_test.go +++ b/go/store/cmd/noms/noms_log_test.go @@ -28,12 +28,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/datas" - "github.com/liquidata-inc/dolt/go/store/spec" - "github.com/liquidata-inc/dolt/go/store/types" - "github.com/liquidata-inc/dolt/go/store/util/clienttest" - "github.com/liquidata-inc/dolt/go/store/util/test" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/datas" + "github.com/dolthub/dolt/go/store/spec" + "github.com/dolthub/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/util/clienttest" + "github.com/dolthub/dolt/go/store/util/test" ) func TestNomsLog(t *testing.T) { diff --git a/go/store/cmd/noms/noms_manifest.go b/go/store/cmd/noms/noms_manifest.go index 1a74bd4ce0..ccf1518939 100644 --- a/go/store/cmd/noms/noms_manifest.go +++ b/go/store/cmd/noms/noms_manifest.go @@ -25,10 +25,10 @@ import ( "github.com/dustin/go-humanize" flag "github.com/juju/gnuflag" - "github.com/liquidata-inc/dolt/go/store/cmd/noms/util" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/nbs" - "github.com/liquidata-inc/dolt/go/store/spec" + "github.com/dolthub/dolt/go/store/cmd/noms/util" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/nbs" + "github.com/dolthub/dolt/go/store/spec" ) var nomsManifest = &util.Command{ diff --git a/go/store/cmd/noms/noms_map.go b/go/store/cmd/noms/noms_map.go index 8e059f45f8..92bf73d690 100644 --- a/go/store/cmd/noms/noms_map.go +++ b/go/store/cmd/noms/noms_map.go @@ -27,12 +27,12 @@ import ( "github.com/attic-labs/kingpin" - "github.com/liquidata-inc/dolt/go/store/cmd/noms/util" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/datas" - "github.com/liquidata-inc/dolt/go/store/diff" - "github.com/liquidata-inc/dolt/go/store/spec" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/cmd/noms/util" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/datas" + "github.com/dolthub/dolt/go/store/diff" + "github.com/dolthub/dolt/go/store/spec" + "github.com/dolthub/dolt/go/store/types" ) func nomsMap(ctx context.Context, noms *kingpin.Application) (*kingpin.CmdClause, util.KingpinHandler) { diff --git a/go/store/cmd/noms/noms_merge.go b/go/store/cmd/noms/noms_merge.go index 071211cd89..93d71cd8e8 100644 --- a/go/store/cmd/noms/noms_merge.go +++ b/go/store/cmd/noms/noms_merge.go @@ -30,14 +30,14 @@ import ( flag "github.com/juju/gnuflag" - "github.com/liquidata-inc/dolt/go/store/cmd/noms/util" - "github.com/liquidata-inc/dolt/go/store/config" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/datas" - "github.com/liquidata-inc/dolt/go/store/merge" - "github.com/liquidata-inc/dolt/go/store/types" - "github.com/liquidata-inc/dolt/go/store/util/status" - "github.com/liquidata-inc/dolt/go/store/util/verbose" + "github.com/dolthub/dolt/go/store/cmd/noms/util" + "github.com/dolthub/dolt/go/store/config" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/datas" + "github.com/dolthub/dolt/go/store/merge" + "github.com/dolthub/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/util/status" + "github.com/dolthub/dolt/go/store/util/verbose" ) var ( diff --git a/go/store/cmd/noms/noms_merge_test.go b/go/store/cmd/noms/noms_merge_test.go index ef09ed5a8a..ded2f3b194 100644 --- a/go/store/cmd/noms/noms_merge_test.go +++ b/go/store/cmd/noms/noms_merge_test.go @@ -31,11 +31,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" - "github.com/liquidata-inc/dolt/go/libraries/utils/osutil" - "github.com/liquidata-inc/dolt/go/store/datas" - "github.com/liquidata-inc/dolt/go/store/spec" - "github.com/liquidata-inc/dolt/go/store/types" - "github.com/liquidata-inc/dolt/go/store/util/clienttest" + "github.com/dolthub/dolt/go/libraries/utils/osutil" + "github.com/dolthub/dolt/go/store/datas" + "github.com/dolthub/dolt/go/store/spec" + "github.com/dolthub/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/util/clienttest" ) type nomsMergeTestSuite struct { diff --git a/go/store/cmd/noms/noms_root.go b/go/store/cmd/noms/noms_root.go index a638e54556..77955dfe75 100644 --- a/go/store/cmd/noms/noms_root.go +++ b/go/store/cmd/noms/noms_root.go @@ -29,12 +29,12 @@ import ( flag "github.com/juju/gnuflag" - "github.com/liquidata-inc/dolt/go/store/cmd/noms/util" - "github.com/liquidata-inc/dolt/go/store/config" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/datas" - "github.com/liquidata-inc/dolt/go/store/hash" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/cmd/noms/util" + "github.com/dolthub/dolt/go/store/config" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/datas" + "github.com/dolthub/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/types" ) var nomsRoot = &util.Command{ diff --git a/go/store/cmd/noms/noms_root_test.go b/go/store/cmd/noms/noms_root_test.go index 7b6dee57b8..f524a318af 100644 --- a/go/store/cmd/noms/noms_root_test.go +++ b/go/store/cmd/noms/noms_root_test.go @@ -27,9 +27,9 @@ import ( "github.com/stretchr/testify/suite" - "github.com/liquidata-inc/dolt/go/store/spec" - "github.com/liquidata-inc/dolt/go/store/types" - "github.com/liquidata-inc/dolt/go/store/util/clienttest" + "github.com/dolthub/dolt/go/store/spec" + "github.com/dolthub/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/util/clienttest" ) func TestNomsRoot(t *testing.T) { diff --git a/go/store/cmd/noms/noms_set.go b/go/store/cmd/noms/noms_set.go index fed3c6fb50..acc2a1ccd1 100644 --- a/go/store/cmd/noms/noms_set.go +++ b/go/store/cmd/noms/noms_set.go @@ -29,12 +29,12 @@ import ( "github.com/attic-labs/kingpin" - "github.com/liquidata-inc/dolt/go/store/cmd/noms/util" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/datas" - "github.com/liquidata-inc/dolt/go/store/diff" - "github.com/liquidata-inc/dolt/go/store/spec" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/cmd/noms/util" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/datas" + "github.com/dolthub/dolt/go/store/diff" + "github.com/dolthub/dolt/go/store/spec" + "github.com/dolthub/dolt/go/store/types" ) func nomsSet(ctx context.Context, noms *kingpin.Application) (*kingpin.CmdClause, util.KingpinHandler) { diff --git a/go/store/cmd/noms/noms_show.go b/go/store/cmd/noms/noms_show.go index ecf744d079..14a6639dca 100644 --- a/go/store/cmd/noms/noms_show.go +++ b/go/store/cmd/noms/noms_show.go @@ -30,12 +30,12 @@ import ( flag "github.com/juju/gnuflag" - "github.com/liquidata-inc/dolt/go/store/cmd/noms/util" - "github.com/liquidata-inc/dolt/go/store/config" - "github.com/liquidata-inc/dolt/go/store/types" - "github.com/liquidata-inc/dolt/go/store/util/datetime" - "github.com/liquidata-inc/dolt/go/store/util/outputpager" - "github.com/liquidata-inc/dolt/go/store/util/verbose" + "github.com/dolthub/dolt/go/store/cmd/noms/util" + "github.com/dolthub/dolt/go/store/config" + "github.com/dolthub/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/util/datetime" + "github.com/dolthub/dolt/go/store/util/outputpager" + "github.com/dolthub/dolt/go/store/util/verbose" ) var nomsShow = &util.Command{ diff --git a/go/store/cmd/noms/noms_show_test.go b/go/store/cmd/noms/noms_show_test.go index 4a9ca65bfa..8fec7e3edf 100644 --- a/go/store/cmd/noms/noms_show_test.go +++ b/go/store/cmd/noms/noms_show_test.go @@ -28,11 +28,11 @@ import ( "github.com/stretchr/testify/suite" - "github.com/liquidata-inc/dolt/go/store/chunks" - "github.com/liquidata-inc/dolt/go/store/spec" - "github.com/liquidata-inc/dolt/go/store/types" - "github.com/liquidata-inc/dolt/go/store/util/clienttest" - "github.com/liquidata-inc/dolt/go/store/util/test" + "github.com/dolthub/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/spec" + "github.com/dolthub/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/util/clienttest" + "github.com/dolthub/dolt/go/store/util/test" ) func TestNomsShow(t *testing.T) { diff --git a/go/store/cmd/noms/noms_stats.go b/go/store/cmd/noms/noms_stats.go index 40d9ffd72d..8330ed0603 100644 --- a/go/store/cmd/noms/noms_stats.go +++ b/go/store/cmd/noms/noms_stats.go @@ -27,8 +27,8 @@ import ( "github.com/attic-labs/kingpin" - "github.com/liquidata-inc/dolt/go/store/cmd/noms/util" - "github.com/liquidata-inc/dolt/go/store/config" + "github.com/dolthub/dolt/go/store/cmd/noms/util" + "github.com/dolthub/dolt/go/store/config" ) func nomsStats(ctx context.Context, noms *kingpin.Application) (*kingpin.CmdClause, util.KingpinHandler) { diff --git a/go/store/cmd/noms/noms_struct.go b/go/store/cmd/noms/noms_struct.go index c489b6f018..78fcc21716 100644 --- a/go/store/cmd/noms/noms_struct.go +++ b/go/store/cmd/noms/noms_struct.go @@ -27,12 +27,12 @@ import ( "github.com/attic-labs/kingpin" - "github.com/liquidata-inc/dolt/go/store/cmd/noms/util" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/datas" - "github.com/liquidata-inc/dolt/go/store/diff" - "github.com/liquidata-inc/dolt/go/store/spec" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/cmd/noms/util" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/datas" + "github.com/dolthub/dolt/go/store/diff" + "github.com/dolthub/dolt/go/store/spec" + "github.com/dolthub/dolt/go/store/types" ) func nomsStruct(ctx context.Context, noms *kingpin.Application) (*kingpin.CmdClause, util.KingpinHandler) { diff --git a/go/store/cmd/noms/noms_sync.go b/go/store/cmd/noms/noms_sync.go index 37d2d6ce18..57ba5f8958 100644 --- a/go/store/cmd/noms/noms_sync.go +++ b/go/store/cmd/noms/noms_sync.go @@ -30,13 +30,13 @@ import ( "github.com/dustin/go-humanize" flag "github.com/juju/gnuflag" - "github.com/liquidata-inc/dolt/go/store/cmd/noms/util" - "github.com/liquidata-inc/dolt/go/store/config" - "github.com/liquidata-inc/dolt/go/store/datas" - "github.com/liquidata-inc/dolt/go/store/types" - "github.com/liquidata-inc/dolt/go/store/util/profile" - "github.com/liquidata-inc/dolt/go/store/util/status" - "github.com/liquidata-inc/dolt/go/store/util/verbose" + "github.com/dolthub/dolt/go/store/cmd/noms/util" + "github.com/dolthub/dolt/go/store/config" + "github.com/dolthub/dolt/go/store/datas" + "github.com/dolthub/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/util/profile" + "github.com/dolthub/dolt/go/store/util/status" + "github.com/dolthub/dolt/go/store/util/verbose" ) var ( diff --git a/go/store/cmd/noms/noms_sync_test.go b/go/store/cmd/noms/noms_sync_test.go index 823cdfa336..be659ce0f9 100644 --- a/go/store/cmd/noms/noms_sync_test.go +++ b/go/store/cmd/noms/noms_sync_test.go @@ -28,11 +28,11 @@ import ( "github.com/stretchr/testify/suite" - "github.com/liquidata-inc/dolt/go/store/datas" - "github.com/liquidata-inc/dolt/go/store/nbs" - "github.com/liquidata-inc/dolt/go/store/spec" - "github.com/liquidata-inc/dolt/go/store/types" - "github.com/liquidata-inc/dolt/go/store/util/clienttest" + "github.com/dolthub/dolt/go/store/datas" + "github.com/dolthub/dolt/go/store/nbs" + "github.com/dolthub/dolt/go/store/spec" + "github.com/dolthub/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/util/clienttest" ) func TestSync(t *testing.T) { diff --git a/go/store/cmd/noms/noms_version.go b/go/store/cmd/noms/noms_version.go index 5c872b7efa..304dacdb80 100644 --- a/go/store/cmd/noms/noms_version.go +++ b/go/store/cmd/noms/noms_version.go @@ -28,8 +28,8 @@ import ( flag "github.com/juju/gnuflag" - "github.com/liquidata-inc/dolt/go/store/cmd/noms/util" - "github.com/liquidata-inc/dolt/go/store/constants" + "github.com/dolthub/dolt/go/store/cmd/noms/util" + "github.com/dolthub/dolt/go/store/constants" ) var nomsVersion = &util.Command{ diff --git a/go/store/cmd/noms/noms_version_test.go b/go/store/cmd/noms/noms_version_test.go index 18e83d9ef8..5c5d9f62b6 100644 --- a/go/store/cmd/noms/noms_version_test.go +++ b/go/store/cmd/noms/noms_version_test.go @@ -27,8 +27,8 @@ import ( "github.com/stretchr/testify/suite" - "github.com/liquidata-inc/dolt/go/store/constants" - "github.com/liquidata-inc/dolt/go/store/util/clienttest" + "github.com/dolthub/dolt/go/store/constants" + "github.com/dolthub/dolt/go/store/util/clienttest" ) func TestVersion(t *testing.T) { diff --git a/go/store/cmd/noms/util/check_error.go b/go/store/cmd/noms/util/check_error.go index 820f52e930..680892616c 100644 --- a/go/store/cmd/noms/util/check_error.go +++ b/go/store/cmd/noms/util/check_error.go @@ -27,7 +27,7 @@ import ( flag "github.com/juju/gnuflag" - "github.com/liquidata-inc/dolt/go/store/util/exit" + "github.com/dolthub/dolt/go/store/util/exit" ) func CheckError(err error) { diff --git a/go/store/config/config.go b/go/store/config/config.go index cc06c8fa7f..8982e2e0ca 100644 --- a/go/store/config/config.go +++ b/go/store/config/config.go @@ -30,7 +30,7 @@ import ( "github.com/BurntSushi/toml" - "github.com/liquidata-inc/dolt/go/store/spec" + "github.com/dolthub/dolt/go/store/spec" ) // All configuration diff --git a/go/store/config/config_test.go b/go/store/config/config_test.go index a79daa3ac7..b09829b8fe 100644 --- a/go/store/config/config_test.go +++ b/go/store/config/config_test.go @@ -30,8 +30,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/libraries/utils/osutil" - "github.com/liquidata-inc/dolt/go/store/spec" + "github.com/dolthub/dolt/go/libraries/utils/osutil" + "github.com/dolthub/dolt/go/store/spec" ) const ( diff --git a/go/store/config/resolver.go b/go/store/config/resolver.go index 1718bf71a4..48f6cf1dca 100644 --- a/go/store/config/resolver.go +++ b/go/store/config/resolver.go @@ -26,11 +26,11 @@ import ( "fmt" "strings" - "github.com/liquidata-inc/dolt/go/store/chunks" - "github.com/liquidata-inc/dolt/go/store/datas" - "github.com/liquidata-inc/dolt/go/store/spec" - "github.com/liquidata-inc/dolt/go/store/types" - "github.com/liquidata-inc/dolt/go/store/util/verbose" + "github.com/dolthub/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/datas" + "github.com/dolthub/dolt/go/store/spec" + "github.com/dolthub/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/util/verbose" ) type Resolver struct { diff --git a/go/store/config/resolver_test.go b/go/store/config/resolver_test.go index 58e957bcab..754195047e 100644 --- a/go/store/config/resolver_test.go +++ b/go/store/config/resolver_test.go @@ -29,8 +29,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/libraries/utils/osutil" - "github.com/liquidata-inc/dolt/go/store/spec" + "github.com/dolthub/dolt/go/libraries/utils/osutil" + "github.com/dolthub/dolt/go/store/spec" ) const ( diff --git a/go/store/datas/commit.go b/go/store/datas/commit.go index 6ccfb08e77..bef4a4fba9 100644 --- a/go/store/datas/commit.go +++ b/go/store/datas/commit.go @@ -26,10 +26,10 @@ import ( "fmt" "sort" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/hash" - "github.com/liquidata-inc/dolt/go/store/nomdl" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/nomdl" + "github.com/dolthub/dolt/go/store/types" ) const ( diff --git a/go/store/datas/commit_options.go b/go/store/datas/commit_options.go index e59a76d2f3..3d51f31fb8 100644 --- a/go/store/datas/commit_options.go +++ b/go/store/datas/commit_options.go @@ -22,8 +22,8 @@ package datas import ( - "github.com/liquidata-inc/dolt/go/store/merge" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/merge" + "github.com/dolthub/dolt/go/store/types" ) // CommitOptions is used to pass options into Commit. diff --git a/go/store/datas/commit_test.go b/go/store/datas/commit_test.go index 823650b615..4ef38fc6c2 100644 --- a/go/store/datas/commit_test.go +++ b/go/store/datas/commit_test.go @@ -27,10 +27,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/store/chunks" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/nomdl" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/nomdl" + "github.com/dolthub/dolt/go/store/types" ) func mustHead(ds Dataset) types.Struct { diff --git a/go/store/datas/database.go b/go/store/datas/database.go index ab7a51cb00..92b231e40f 100644 --- a/go/store/datas/database.go +++ b/go/store/datas/database.go @@ -26,10 +26,10 @@ import ( "context" "io" - "github.com/liquidata-inc/dolt/go/store/nbs" + "github.com/dolthub/dolt/go/store/nbs" - "github.com/liquidata-inc/dolt/go/store/chunks" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/types" ) // Database provides versioned storage for noms values. While Values can be diff --git a/go/store/datas/database_common.go b/go/store/datas/database_common.go index 4719668606..2e5233ebd8 100644 --- a/go/store/datas/database_common.go +++ b/go/store/datas/database_common.go @@ -26,12 +26,12 @@ import ( "errors" "fmt" - "github.com/liquidata-inc/dolt/go/store/chunks" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/hash" - "github.com/liquidata-inc/dolt/go/store/merge" - "github.com/liquidata-inc/dolt/go/store/types" - "github.com/liquidata-inc/dolt/go/store/util/random" + "github.com/dolthub/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/merge" + "github.com/dolthub/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/util/random" ) type database struct { diff --git a/go/store/datas/database_test.go b/go/store/datas/database_test.go index 51b14bbeb6..b6215b1c05 100644 --- a/go/store/datas/database_test.go +++ b/go/store/datas/database_test.go @@ -28,12 +28,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" - "github.com/liquidata-inc/dolt/go/store/atomicerr" - "github.com/liquidata-inc/dolt/go/store/chunks" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/hash" - "github.com/liquidata-inc/dolt/go/store/merge" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/atomicerr" + "github.com/dolthub/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/merge" + "github.com/dolthub/dolt/go/store/types" ) func TestLocalDatabase(t *testing.T) { diff --git a/go/store/datas/dataset.go b/go/store/datas/dataset.go index 1e2b3da14f..7f0229837a 100644 --- a/go/store/datas/dataset.go +++ b/go/store/datas/dataset.go @@ -24,8 +24,8 @@ package datas import ( "regexp" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/types" ) // DatasetRe is a regexp that matches a legal Dataset name anywhere within the diff --git a/go/store/datas/dataset_test.go b/go/store/datas/dataset_test.go index 010a76369e..72956b3b2d 100644 --- a/go/store/datas/dataset_test.go +++ b/go/store/datas/dataset_test.go @@ -27,9 +27,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/store/chunks" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/types" ) func mustGetValue(v types.Value, found bool, err error) types.Value { diff --git a/go/store/datas/pull.go b/go/store/datas/pull.go index a8ae690b4b..96da4f0b16 100644 --- a/go/store/datas/pull.go +++ b/go/store/datas/pull.go @@ -32,11 +32,11 @@ import ( "github.com/cenkalti/backoff" "github.com/golang/snappy" - "github.com/liquidata-inc/dolt/go/store/atomicerr" - "github.com/liquidata-inc/dolt/go/store/chunks" - "github.com/liquidata-inc/dolt/go/store/hash" - "github.com/liquidata-inc/dolt/go/store/nbs" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/atomicerr" + "github.com/dolthub/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/nbs" + "github.com/dolthub/dolt/go/store/types" ) type PullProgress struct { diff --git a/go/store/datas/pull_test.go b/go/store/datas/pull_test.go index b7570fd468..8842fcba73 100644 --- a/go/store/datas/pull_test.go +++ b/go/store/datas/pull_test.go @@ -33,11 +33,11 @@ import ( "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - "github.com/liquidata-inc/dolt/go/store/chunks" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/hash" - "github.com/liquidata-inc/dolt/go/store/nbs" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/nbs" + "github.com/dolthub/dolt/go/store/types" ) const datasetID = "ds1" diff --git a/go/store/datas/puller.go b/go/store/datas/puller.go index 52baa6894a..e4fb99fb71 100644 --- a/go/store/datas/puller.go +++ b/go/store/datas/puller.go @@ -22,11 +22,11 @@ import ( "path/filepath" "sync" - "github.com/liquidata-inc/dolt/go/store/atomicerr" - "github.com/liquidata-inc/dolt/go/store/chunks" - "github.com/liquidata-inc/dolt/go/store/hash" - "github.com/liquidata-inc/dolt/go/store/nbs" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/atomicerr" + "github.com/dolthub/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/nbs" + "github.com/dolthub/dolt/go/store/types" ) type FileReaderWithSize struct { diff --git a/go/store/datas/puller_test.go b/go/store/datas/puller_test.go index e2bfdbd6c0..bc13999c25 100644 --- a/go/store/datas/puller_test.go +++ b/go/store/datas/puller_test.go @@ -26,9 +26,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/store/nbs" - "github.com/liquidata-inc/dolt/go/store/types" - "github.com/liquidata-inc/dolt/go/store/util/clienttest" + "github.com/dolthub/dolt/go/store/nbs" + "github.com/dolthub/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/util/clienttest" ) func mustTuple(tpl types.Tuple, err error) types.Tuple { diff --git a/go/store/datas/serialize_hashes.go b/go/store/datas/serialize_hashes.go index 285c876f08..c91ce42e94 100644 --- a/go/store/datas/serialize_hashes.go +++ b/go/store/datas/serialize_hashes.go @@ -26,8 +26,8 @@ import ( "errors" "io" - "github.com/liquidata-inc/dolt/go/store/chunks" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/hash" ) func serializeHashes(w io.Writer, batch chunks.ReadBatch) error { diff --git a/go/store/datas/serialize_hashes_test.go b/go/store/datas/serialize_hashes_test.go index d1e8b6f9b2..d19bb94d49 100644 --- a/go/store/datas/serialize_hashes_test.go +++ b/go/store/datas/serialize_hashes_test.go @@ -27,8 +27,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/store/chunks" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/hash" ) func TestHashRoundTrip(t *testing.T) { diff --git a/go/store/datas/tag.go b/go/store/datas/tag.go index 5092a2bc4e..037de48a37 100644 --- a/go/store/datas/tag.go +++ b/go/store/datas/tag.go @@ -17,8 +17,8 @@ package datas import ( "context" - "github.com/liquidata-inc/dolt/go/store/nomdl" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/nomdl" + "github.com/dolthub/dolt/go/store/types" ) const ( diff --git a/go/store/datas/tag_test.go b/go/store/datas/tag_test.go index 54c91d7d89..9be1a1d971 100644 --- a/go/store/datas/tag_test.go +++ b/go/store/datas/tag_test.go @@ -20,8 +20,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/store/chunks" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/types" ) func TestNewTag(t *testing.T) { diff --git a/go/store/diff/apply_patch.go b/go/store/diff/apply_patch.go index b0a97ebd39..d22d56f6ad 100644 --- a/go/store/diff/apply_patch.go +++ b/go/store/diff/apply_patch.go @@ -25,8 +25,8 @@ import ( "context" "fmt" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/types" ) // Apply applies a Patch (list of diffs) to a graph. It fulfills the diff --git a/go/store/diff/apply_patch_test.go b/go/store/diff/apply_patch_test.go index e0fb92090a..6de2d784d7 100644 --- a/go/store/diff/apply_patch_test.go +++ b/go/store/diff/apply_patch_test.go @@ -27,11 +27,11 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/store/atomicerr" - "github.com/liquidata-inc/dolt/go/store/chunks" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/marshal" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/atomicerr" + "github.com/dolthub/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/marshal" + "github.com/dolthub/dolt/go/store/types" ) func mustValue(v types.Value, err error) types.Value { diff --git a/go/store/diff/diff.go b/go/store/diff/diff.go index 07b8a455a5..62f4f6d65c 100644 --- a/go/store/diff/diff.go +++ b/go/store/diff/diff.go @@ -25,9 +25,9 @@ import ( "context" "sync/atomic" - "github.com/liquidata-inc/dolt/go/store/atomicerr" + "github.com/dolthub/dolt/go/store/atomicerr" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) type ( diff --git a/go/store/diff/diff_test.go b/go/store/diff/diff_test.go index 5985aec792..15a8799866 100644 --- a/go/store/diff/diff_test.go +++ b/go/store/diff/diff_test.go @@ -30,11 +30,11 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/store/atomicerr" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/types" - "github.com/liquidata-inc/dolt/go/store/util/test" - "github.com/liquidata-inc/dolt/go/store/util/writers" + "github.com/dolthub/dolt/go/store/atomicerr" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/util/test" + "github.com/dolthub/dolt/go/store/util/writers" ) var ( diff --git a/go/store/diff/patch.go b/go/store/diff/patch.go index 3f004fae49..c640dcefcc 100644 --- a/go/store/diff/patch.go +++ b/go/store/diff/patch.go @@ -24,7 +24,7 @@ package diff import ( "bytes" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) // Patch is a list of difference objects that can be applied to a graph diff --git a/go/store/diff/patch_test.go b/go/store/diff/patch_test.go index c94278fb67..2de0f7fb39 100644 --- a/go/store/diff/patch_test.go +++ b/go/store/diff/patch_test.go @@ -27,7 +27,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) func TestPatchPathPartCompare(t *testing.T) { diff --git a/go/store/diff/print_diff.go b/go/store/diff/print_diff.go index 0c43ec9386..fb9d92b923 100644 --- a/go/store/diff/print_diff.go +++ b/go/store/diff/print_diff.go @@ -27,9 +27,9 @@ import ( "github.com/dustin/go-humanize" - "github.com/liquidata-inc/dolt/go/store/atomicerr" - "github.com/liquidata-inc/dolt/go/store/types" - "github.com/liquidata-inc/dolt/go/store/util/writers" + "github.com/dolthub/dolt/go/store/atomicerr" + "github.com/dolthub/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/util/writers" ) type prefixOp string diff --git a/go/store/diff/summary.go b/go/store/diff/summary.go index 633b362ee3..f6a59d631a 100644 --- a/go/store/diff/summary.go +++ b/go/store/diff/summary.go @@ -28,11 +28,11 @@ import ( humanize "github.com/dustin/go-humanize" - "github.com/liquidata-inc/dolt/go/store/atomicerr" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/datas" - "github.com/liquidata-inc/dolt/go/store/types" - "github.com/liquidata-inc/dolt/go/store/util/status" + "github.com/dolthub/dolt/go/store/atomicerr" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/datas" + "github.com/dolthub/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/util/status" ) // Summary prints a summary of the diff between two values to stdout. diff --git a/go/store/hash/hash.go b/go/store/hash/hash.go index 25beff558f..64e71068c3 100644 --- a/go/store/hash/hash.go +++ b/go/store/hash/hash.go @@ -52,7 +52,7 @@ import ( "regexp" "strconv" - "github.com/liquidata-inc/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/d" ) const ( diff --git a/go/store/marshal/decode.go b/go/store/marshal/decode.go index 101a7341ea..f31c823aad 100644 --- a/go/store/marshal/decode.go +++ b/go/store/marshal/decode.go @@ -27,7 +27,7 @@ import ( "reflect" "sync" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) // Unmarshal converts a Noms value into a Go value. It decodes v and stores the diff --git a/go/store/marshal/decode_test.go b/go/store/marshal/decode_test.go index 98fb7d6ca2..ade49d6eb9 100644 --- a/go/store/marshal/decode_test.go +++ b/go/store/marshal/decode_test.go @@ -34,9 +34,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/store/chunks" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/types" ) func mustGetValue(val types.Value, found bool, err error) types.Value { diff --git a/go/store/marshal/encode.go b/go/store/marshal/encode.go index 182ff7ae09..3169565716 100644 --- a/go/store/marshal/encode.go +++ b/go/store/marshal/encode.go @@ -32,7 +32,7 @@ import ( "strings" "sync" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) // Marshal converts a Go value to a Noms value. diff --git a/go/store/marshal/encode_test.go b/go/store/marshal/encode_test.go index 2efb23aa43..892f6b6169 100644 --- a/go/store/marshal/encode_test.go +++ b/go/store/marshal/encode_test.go @@ -33,7 +33,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) func TestEncode(tt *testing.T) { diff --git a/go/store/marshal/encode_type.go b/go/store/marshal/encode_type.go index fec6f90bcd..eeb488e7fe 100644 --- a/go/store/marshal/encode_type.go +++ b/go/store/marshal/encode_type.go @@ -28,7 +28,7 @@ import ( "fmt" "reflect" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) // MarshalType computes a Noms type from a Go type diff --git a/go/store/marshal/encode_type_test.go b/go/store/marshal/encode_type_test.go index cce876501e..c332b858b9 100644 --- a/go/store/marshal/encode_type_test.go +++ b/go/store/marshal/encode_type_test.go @@ -30,8 +30,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/store/nomdl" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/nomdl" + "github.com/dolthub/dolt/go/store/types" ) func TestMarshalTypeType(tt *testing.T) { diff --git a/go/store/merge/candidate.go b/go/store/merge/candidate.go index 55d667fb69..cd14b41ece 100644 --- a/go/store/merge/candidate.go +++ b/go/store/merge/candidate.go @@ -24,10 +24,10 @@ package merge import ( "context" - "github.com/liquidata-inc/dolt/go/store/atomicerr" + "github.com/dolthub/dolt/go/store/atomicerr" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/types" ) // candidate represents a collection that is a candidate to be merged. This diff --git a/go/store/merge/three_way.go b/go/store/merge/three_way.go index 6dec5fcec5..71a4c90eaf 100644 --- a/go/store/merge/three_way.go +++ b/go/store/merge/three_way.go @@ -26,8 +26,8 @@ import ( "errors" "fmt" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/types" ) // Policy functors are used to merge two values (a and b) against a common diff --git a/go/store/merge/three_way_keyval_test.go b/go/store/merge/three_way_keyval_test.go index 9043892b5e..4cebc6c744 100644 --- a/go/store/merge/three_way_keyval_test.go +++ b/go/store/merge/three_way_keyval_test.go @@ -27,7 +27,7 @@ import ( "github.com/stretchr/testify/suite" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) func TestThreeWayMapMerge(t *testing.T) { diff --git a/go/store/merge/three_way_list.go b/go/store/merge/three_way_list.go index 0dc2dffbff..6fdb1988e9 100644 --- a/go/store/merge/three_way_list.go +++ b/go/store/merge/three_way_list.go @@ -25,10 +25,10 @@ import ( "context" "fmt" - "github.com/liquidata-inc/dolt/go/store/atomicerr" + "github.com/dolthub/dolt/go/store/atomicerr" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/types" ) func threeWayListMerge(ctx context.Context, a, b, parent types.List) (merged types.List, err error) { diff --git a/go/store/merge/three_way_list_test.go b/go/store/merge/three_way_list_test.go index a9fb5d7310..939a28753b 100644 --- a/go/store/merge/three_way_list_test.go +++ b/go/store/merge/three_way_list_test.go @@ -27,7 +27,7 @@ import ( "github.com/stretchr/testify/suite" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) func TestThreeWayListMerge(t *testing.T) { diff --git a/go/store/merge/three_way_ordered_sequence.go b/go/store/merge/three_way_ordered_sequence.go index 1a1006774f..19ae0510ea 100644 --- a/go/store/merge/three_way_ordered_sequence.go +++ b/go/store/merge/three_way_ordered_sequence.go @@ -25,10 +25,10 @@ import ( "context" "fmt" - "github.com/liquidata-inc/dolt/go/store/atomicerr" + "github.com/dolthub/dolt/go/store/atomicerr" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/types" ) type applyFunc func(candidate, types.ValueChanged, types.Value) (candidate, error) diff --git a/go/store/merge/three_way_set_test.go b/go/store/merge/three_way_set_test.go index 3ace99d3d0..e84d48fa96 100644 --- a/go/store/merge/three_way_set_test.go +++ b/go/store/merge/three_way_set_test.go @@ -27,7 +27,7 @@ import ( "github.com/stretchr/testify/suite" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) func TestThreeWaySetMerge(t *testing.T) { diff --git a/go/store/merge/three_way_test.go b/go/store/merge/three_way_test.go index 1fcbec6326..b4cbad6d7e 100644 --- a/go/store/merge/three_way_test.go +++ b/go/store/merge/three_way_test.go @@ -28,9 +28,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" - "github.com/liquidata-inc/dolt/go/store/chunks" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/types" ) func mustValue(val types.Value, err error) types.Value { diff --git a/go/store/metrics/histogram.go b/go/store/metrics/histogram.go index bfcbf9f7d7..5f30b535ad 100644 --- a/go/store/metrics/histogram.go +++ b/go/store/metrics/histogram.go @@ -28,7 +28,7 @@ import ( "github.com/dustin/go-humanize" - "github.com/liquidata-inc/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/d" ) // Histogram is a shameless and low-rent knock of the chromium project's diff --git a/go/store/nbs/aws_table_persister.go b/go/store/nbs/aws_table_persister.go index d24e69aa9e..4d453a75de 100644 --- a/go/store/nbs/aws_table_persister.go +++ b/go/store/nbs/aws_table_persister.go @@ -34,8 +34,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/s3" - "github.com/liquidata-inc/dolt/go/store/atomicerr" - "github.com/liquidata-inc/dolt/go/store/util/verbose" + "github.com/dolthub/dolt/go/store/atomicerr" + "github.com/dolthub/dolt/go/store/util/verbose" ) const ( diff --git a/go/store/nbs/aws_table_persister_test.go b/go/store/nbs/aws_table_persister_test.go index 8b89fc92eb..d43bdc00e1 100644 --- a/go/store/nbs/aws_table_persister_test.go +++ b/go/store/nbs/aws_table_persister_test.go @@ -34,7 +34,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/store/util/sizecache" + "github.com/dolthub/dolt/go/store/util/sizecache" ) var parseIndexF = func(bs []byte) (tableIndex, error) { diff --git a/go/store/nbs/benchmarks/block_store_benchmarks.go b/go/store/nbs/benchmarks/block_store_benchmarks.go index fde29d3a69..4b00bca66a 100644 --- a/go/store/nbs/benchmarks/block_store_benchmarks.go +++ b/go/store/nbs/benchmarks/block_store_benchmarks.go @@ -28,9 +28,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/store/chunks" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/hash" ) type storeOpenFn func() (chunks.ChunkStore, error) diff --git a/go/store/nbs/benchmarks/chunker/main.go b/go/store/nbs/benchmarks/chunker/main.go index b4c86b1dd7..ec92c2b4a0 100644 --- a/go/store/nbs/benchmarks/chunker/main.go +++ b/go/store/nbs/benchmarks/chunker/main.go @@ -28,8 +28,8 @@ import ( "github.com/dustin/go-humanize" flag "github.com/juju/gnuflag" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/nbs/benchmarks/gen" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/nbs/benchmarks/gen" ) var ( diff --git a/go/store/nbs/benchmarks/data_source.go b/go/store/nbs/benchmarks/data_source.go index 19550cfd83..b1e0be5e00 100644 --- a/go/store/nbs/benchmarks/data_source.go +++ b/go/store/nbs/benchmarks/data_source.go @@ -32,10 +32,10 @@ import ( "github.com/dustin/go-humanize" flag "github.com/juju/gnuflag" - "github.com/liquidata-inc/dolt/go/store/atomicerr" - "github.com/liquidata-inc/dolt/go/store/chunks" - "github.com/liquidata-inc/dolt/go/store/hash" - "github.com/liquidata-inc/dolt/go/store/nbs/benchmarks/gen" + "github.com/dolthub/dolt/go/store/atomicerr" + "github.com/dolthub/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/nbs/benchmarks/gen" ) var readFile = flag.String("input-file", "", "A file full of test data. Creates and saves associated .chunks file at runtime if it doesn't yet exist. If none is specified, data and .chunks files will be generated and saved.") diff --git a/go/store/nbs/benchmarks/file_block_store.go b/go/store/nbs/benchmarks/file_block_store.go index 0925360113..8a2191e8d7 100644 --- a/go/store/nbs/benchmarks/file_block_store.go +++ b/go/store/nbs/benchmarks/file_block_store.go @@ -29,8 +29,8 @@ import ( "github.com/dustin/go-humanize" - "github.com/liquidata-inc/dolt/go/store/chunks" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/hash" ) type fileBlockStore struct { diff --git a/go/store/nbs/benchmarks/gen/gen.go b/go/store/nbs/benchmarks/gen/gen.go index c36a2b15ca..8b61febfe9 100644 --- a/go/store/nbs/benchmarks/gen/gen.go +++ b/go/store/nbs/benchmarks/gen/gen.go @@ -32,8 +32,8 @@ import ( "github.com/dustin/go-humanize" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/hash" ) const ( diff --git a/go/store/nbs/benchmarks/main.go b/go/store/nbs/benchmarks/main.go index 36d212b060..c3e5156acf 100644 --- a/go/store/nbs/benchmarks/main.go +++ b/go/store/nbs/benchmarks/main.go @@ -38,11 +38,11 @@ import ( flag "github.com/juju/gnuflag" "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/store/chunks" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/nbs" - "github.com/liquidata-inc/dolt/go/store/types" - "github.com/liquidata-inc/dolt/go/store/util/profile" + "github.com/dolthub/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/nbs" + "github.com/dolthub/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/util/profile" ) var ( diff --git a/go/store/nbs/benchmarks/null_block_store.go b/go/store/nbs/benchmarks/null_block_store.go index 039e08512d..2b5607255b 100644 --- a/go/store/nbs/benchmarks/null_block_store.go +++ b/go/store/nbs/benchmarks/null_block_store.go @@ -24,8 +24,8 @@ package main import ( "context" - "github.com/liquidata-inc/dolt/go/store/chunks" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/hash" ) type nullBlockStore struct { diff --git a/go/store/nbs/block_store_test.go b/go/store/nbs/block_store_test.go index ed2eb12396..5cfef72e65 100644 --- a/go/store/nbs/block_store_test.go +++ b/go/store/nbs/block_store_test.go @@ -35,11 +35,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" - "github.com/liquidata-inc/dolt/go/libraries/utils/osutil" - "github.com/liquidata-inc/dolt/go/store/chunks" - "github.com/liquidata-inc/dolt/go/store/constants" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/libraries/utils/osutil" + "github.com/dolthub/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/constants" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/hash" ) const testMemTableSize = 1 << 8 diff --git a/go/store/nbs/bs_manifest.go b/go/store/nbs/bs_manifest.go index fefd1fc9b7..10fc4fc141 100644 --- a/go/store/nbs/bs_manifest.go +++ b/go/store/nbs/bs_manifest.go @@ -18,7 +18,7 @@ import ( "bytes" "context" - "github.com/liquidata-inc/dolt/go/store/blobstore" + "github.com/dolthub/dolt/go/store/blobstore" ) const ( diff --git a/go/store/nbs/bs_persister.go b/go/store/nbs/bs_persister.go index a2a1a76b64..18973df468 100644 --- a/go/store/nbs/bs_persister.go +++ b/go/store/nbs/bs_persister.go @@ -20,7 +20,7 @@ import ( "io" "time" - "github.com/liquidata-inc/dolt/go/store/blobstore" + "github.com/dolthub/dolt/go/store/blobstore" ) type blobstorePersister struct { diff --git a/go/store/nbs/byte_sink.go b/go/store/nbs/byte_sink.go index 450197e29f..5dd62f2f5a 100644 --- a/go/store/nbs/byte_sink.go +++ b/go/store/nbs/byte_sink.go @@ -22,10 +22,10 @@ import ( "os" "sync" - "github.com/liquidata-inc/dolt/go/store/util/tempfiles" + "github.com/dolthub/dolt/go/store/util/tempfiles" - "github.com/liquidata-inc/dolt/go/libraries/utils/iohelp" - "github.com/liquidata-inc/dolt/go/store/atomicerr" + "github.com/dolthub/dolt/go/libraries/utils/iohelp" + "github.com/dolthub/dolt/go/store/atomicerr" ) func flushSinkToFile(sink ByteSink, path string) (err error) { diff --git a/go/store/nbs/cache.go b/go/store/nbs/cache.go index 550b670b87..47c038830e 100644 --- a/go/store/nbs/cache.go +++ b/go/store/nbs/cache.go @@ -27,9 +27,9 @@ import ( "io/ioutil" "os" - "github.com/liquidata-inc/dolt/go/store/chunks" - "github.com/liquidata-inc/dolt/go/store/hash" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/types" ) const ( diff --git a/go/store/nbs/cmp_chunk_table_writer.go b/go/store/nbs/cmp_chunk_table_writer.go index 2e25fdbde1..14323bc866 100644 --- a/go/store/nbs/cmp_chunk_table_writer.go +++ b/go/store/nbs/cmp_chunk_table_writer.go @@ -24,7 +24,7 @@ import ( "github.com/golang/snappy" - nomshash "github.com/liquidata-inc/dolt/go/store/hash" + nomshash "github.com/dolthub/dolt/go/store/hash" ) const defaultTableSinkBlockSize = 2 * 1024 * 1024 diff --git a/go/store/nbs/cmp_chunk_table_writer_test.go b/go/store/nbs/cmp_chunk_table_writer_test.go index acbf7f8f32..f75eb88909 100644 --- a/go/store/nbs/cmp_chunk_table_writer_test.go +++ b/go/store/nbs/cmp_chunk_table_writer_test.go @@ -23,9 +23,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/store/atomicerr" - "github.com/liquidata-inc/dolt/go/store/chunks" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/atomicerr" + "github.com/dolthub/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/hash" ) func TestCmpChunkTableWriter(t *testing.T) { diff --git a/go/store/nbs/conjoiner.go b/go/store/nbs/conjoiner.go index 5b54748455..21bacf4e73 100644 --- a/go/store/nbs/conjoiner.go +++ b/go/store/nbs/conjoiner.go @@ -28,7 +28,7 @@ import ( "sync" "time" - "github.com/liquidata-inc/dolt/go/store/atomicerr" + "github.com/dolthub/dolt/go/store/atomicerr" ) type conjoiner interface { diff --git a/go/store/nbs/conjoiner_test.go b/go/store/nbs/conjoiner_test.go index 90f3820f74..c9fea7ce22 100644 --- a/go/store/nbs/conjoiner_test.go +++ b/go/store/nbs/conjoiner_test.go @@ -30,8 +30,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/store/constants" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/constants" + "github.com/dolthub/dolt/go/store/hash" ) type tableSpecsByAscendingCount []tableSpec diff --git a/go/store/nbs/dynamo_fake_test.go b/go/store/nbs/dynamo_fake_test.go index e1c135d37a..5cedea1440 100644 --- a/go/store/nbs/dynamo_fake_test.go +++ b/go/store/nbs/dynamo_fake_test.go @@ -31,7 +31,7 @@ import ( "github.com/aws/aws-sdk-go/service/dynamodb" "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/store/constants" + "github.com/dolthub/dolt/go/store/constants" ) type fakeDDB struct { diff --git a/go/store/nbs/dynamo_manifest.go b/go/store/nbs/dynamo_manifest.go index 16159d9ff0..401eb55032 100644 --- a/go/store/nbs/dynamo_manifest.go +++ b/go/store/nbs/dynamo_manifest.go @@ -33,8 +33,8 @@ import ( "github.com/aws/aws-sdk-go/aws/request" "github.com/aws/aws-sdk-go/service/dynamodb" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/hash" ) const ( diff --git a/go/store/nbs/dynamo_manifest_test.go b/go/store/nbs/dynamo_manifest_test.go index 1296f049b2..63d07c4873 100644 --- a/go/store/nbs/dynamo_manifest_test.go +++ b/go/store/nbs/dynamo_manifest_test.go @@ -27,8 +27,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/store/constants" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/constants" + "github.com/dolthub/dolt/go/store/hash" ) const ( diff --git a/go/store/nbs/dynamo_table_reader.go b/go/store/nbs/dynamo_table_reader.go index 4bbd0d1ddf..2649306838 100644 --- a/go/store/nbs/dynamo_table_reader.go +++ b/go/store/nbs/dynamo_table_reader.go @@ -30,8 +30,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/dynamodb" - "github.com/liquidata-inc/dolt/go/store/util/sizecache" - "github.com/liquidata-inc/dolt/go/store/util/verbose" + "github.com/dolthub/dolt/go/store/util/sizecache" + "github.com/dolthub/dolt/go/store/util/verbose" ) const ( diff --git a/go/store/nbs/dynamo_table_reader_test.go b/go/store/nbs/dynamo_table_reader_test.go index 97003a9c07..881ef69917 100644 --- a/go/store/nbs/dynamo_table_reader_test.go +++ b/go/store/nbs/dynamo_table_reader_test.go @@ -30,7 +30,7 @@ import ( "github.com/aws/aws-sdk-go/service/dynamodb" "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/store/util/sizecache" + "github.com/dolthub/dolt/go/store/util/sizecache" ) func TestDynamoTableReaderAt(t *testing.T) { diff --git a/go/store/nbs/file_manifest.go b/go/store/nbs/file_manifest.go index 62e55fce34..87a0d177ab 100644 --- a/go/store/nbs/file_manifest.go +++ b/go/store/nbs/file_manifest.go @@ -33,8 +33,8 @@ import ( "github.com/juju/fslock" - "github.com/liquidata-inc/dolt/go/store/hash" - "github.com/liquidata-inc/dolt/go/store/util/tempfiles" + "github.com/dolthub/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/util/tempfiles" ) const ( diff --git a/go/store/nbs/file_manifest_test.go b/go/store/nbs/file_manifest_test.go index b5d190dc74..9c785d85b0 100644 --- a/go/store/nbs/file_manifest_test.go +++ b/go/store/nbs/file_manifest_test.go @@ -33,8 +33,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/store/constants" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/constants" + "github.com/dolthub/dolt/go/store/hash" ) func makeFileManifestTempDir(t *testing.T) fileManifest { diff --git a/go/store/nbs/file_table_persister.go b/go/store/nbs/file_table_persister.go index 4ae7b719b1..cf09b17f07 100644 --- a/go/store/nbs/file_table_persister.go +++ b/go/store/nbs/file_table_persister.go @@ -29,9 +29,9 @@ import ( "os" "path/filepath" - "github.com/liquidata-inc/dolt/go/store/util/tempfiles" + "github.com/dolthub/dolt/go/store/util/tempfiles" - "github.com/liquidata-inc/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/d" ) const tempTablePrefix = "nbs_table_" diff --git a/go/store/nbs/frag/main.go b/go/store/nbs/frag/main.go index 7ae6b82dd0..abf643c0b4 100644 --- a/go/store/nbs/frag/main.go +++ b/go/store/nbs/frag/main.go @@ -35,12 +35,12 @@ import ( "github.com/dustin/go-humanize" flag "github.com/juju/gnuflag" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/datas" - "github.com/liquidata-inc/dolt/go/store/hash" - "github.com/liquidata-inc/dolt/go/store/nbs" - "github.com/liquidata-inc/dolt/go/store/types" - "github.com/liquidata-inc/dolt/go/store/util/profile" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/datas" + "github.com/dolthub/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/nbs" + "github.com/dolthub/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/util/profile" ) var ( diff --git a/go/store/nbs/fs_table_cache.go b/go/store/nbs/fs_table_cache.go index e18e0dca29..45b6f07ae6 100644 --- a/go/store/nbs/fs_table_cache.go +++ b/go/store/nbs/fs_table_cache.go @@ -29,9 +29,9 @@ import ( "strings" "sync" - "github.com/liquidata-inc/dolt/go/store/atomicerr" - "github.com/liquidata-inc/dolt/go/store/util/sizecache" - "github.com/liquidata-inc/dolt/go/store/util/tempfiles" + "github.com/dolthub/dolt/go/store/atomicerr" + "github.com/dolthub/dolt/go/store/util/sizecache" + "github.com/dolthub/dolt/go/store/util/tempfiles" ) type tableCache interface { diff --git a/go/store/nbs/manifest.go b/go/store/nbs/manifest.go index 49d2163e11..c7d1bbfc29 100644 --- a/go/store/nbs/manifest.go +++ b/go/store/nbs/manifest.go @@ -29,8 +29,8 @@ import ( "sync" "time" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/hash" ) var ErrCorruptManifest = errors.New("corrupt manifest") diff --git a/go/store/nbs/mem_table.go b/go/store/nbs/mem_table.go index c06b9f13f0..a94f2d6344 100644 --- a/go/store/nbs/mem_table.go +++ b/go/store/nbs/mem_table.go @@ -27,10 +27,10 @@ import ( "sort" "sync" - "github.com/liquidata-inc/dolt/go/store/atomicerr" + "github.com/dolthub/dolt/go/store/atomicerr" - "github.com/liquidata-inc/dolt/go/store/chunks" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/hash" ) func WriteChunks(chunks []chunks.Chunk) (string, []byte, error) { diff --git a/go/store/nbs/mem_table_test.go b/go/store/nbs/mem_table_test.go index 99a2fce0c0..94b14522b2 100644 --- a/go/store/nbs/mem_table_test.go +++ b/go/store/nbs/mem_table_test.go @@ -32,10 +32,10 @@ import ( "github.com/golang/snappy" "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/store/atomicerr" - "github.com/liquidata-inc/dolt/go/store/chunks" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/atomicerr" + "github.com/dolthub/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/types" ) var testMDChunks = []chunks.Chunk{ diff --git a/go/store/nbs/must_test.go b/go/store/nbs/must_test.go index 531a1a8936..34df7151fd 100644 --- a/go/store/nbs/must_test.go +++ b/go/store/nbs/must_test.go @@ -14,7 +14,7 @@ package nbs -import "github.com/liquidata-inc/dolt/go/store/d" +import "github.com/dolthub/dolt/go/store/d" func mustUint32(val uint32, err error) uint32 { d.PanicIfError(err) diff --git a/go/store/nbs/nbs_metrics_wrapper.go b/go/store/nbs/nbs_metrics_wrapper.go index 61ef3c85c9..40fd509e68 100644 --- a/go/store/nbs/nbs_metrics_wrapper.go +++ b/go/store/nbs/nbs_metrics_wrapper.go @@ -19,9 +19,9 @@ import ( "io" "sync/atomic" - "github.com/liquidata-inc/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/chunks" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/hash" ) // NBSMetricWrapper is a ChunkStore implementation that wraps a ChunkStore, and collects metrics on the calls. diff --git a/go/store/nbs/persisting_chunk_source.go b/go/store/nbs/persisting_chunk_source.go index 7d8c1a4e2a..e86bf2f50d 100644 --- a/go/store/nbs/persisting_chunk_source.go +++ b/go/store/nbs/persisting_chunk_source.go @@ -29,9 +29,9 @@ import ( "sync" "time" - "github.com/liquidata-inc/dolt/go/store/atomicerr" + "github.com/dolthub/dolt/go/store/atomicerr" - "github.com/liquidata-inc/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/chunks" ) var ErrNoReader = errors.New("could not get reader") diff --git a/go/store/nbs/root_tracker_test.go b/go/store/nbs/root_tracker_test.go index e06a7a902c..fea3148e29 100644 --- a/go/store/nbs/root_tracker_test.go +++ b/go/store/nbs/root_tracker_test.go @@ -29,9 +29,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/store/chunks" - "github.com/liquidata-inc/dolt/go/store/constants" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/constants" + "github.com/dolthub/dolt/go/store/hash" ) func TestChunkStoreZeroValue(t *testing.T) { diff --git a/go/store/nbs/s3_fake_test.go b/go/store/nbs/s3_fake_test.go index d4c1550525..ac64525ed9 100644 --- a/go/store/nbs/s3_fake_test.go +++ b/go/store/nbs/s3_fake_test.go @@ -37,8 +37,8 @@ import ( "github.com/aws/aws-sdk-go/service/s3" "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/hash" ) type mockAWSError string diff --git a/go/store/nbs/stats.go b/go/store/nbs/stats.go index f68cd715d6..8ce63d4c40 100644 --- a/go/store/nbs/stats.go +++ b/go/store/nbs/stats.go @@ -24,7 +24,7 @@ package nbs import ( "fmt" - "github.com/liquidata-inc/dolt/go/store/metrics" + "github.com/dolthub/dolt/go/store/metrics" ) type Stats struct { diff --git a/go/store/nbs/stats_test.go b/go/store/nbs/stats_test.go index f2e4209a4d..7c22693599 100644 --- a/go/store/nbs/stats_test.go +++ b/go/store/nbs/stats_test.go @@ -29,9 +29,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/store/chunks" - "github.com/liquidata-inc/dolt/go/store/constants" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/constants" + "github.com/dolthub/dolt/go/store/hash" ) func TestStats(t *testing.T) { diff --git a/go/store/nbs/store.go b/go/store/nbs/store.go index 788c9a7a4b..723a372922 100644 --- a/go/store/nbs/store.go +++ b/go/store/nbs/store.go @@ -37,10 +37,10 @@ import ( "github.com/dustin/go-humanize" "github.com/pkg/errors" - "github.com/liquidata-inc/dolt/go/store/atomicerr" - "github.com/liquidata-inc/dolt/go/store/blobstore" - "github.com/liquidata-inc/dolt/go/store/chunks" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/atomicerr" + "github.com/dolthub/dolt/go/store/blobstore" + "github.com/dolthub/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/hash" ) var ErrFetchFailure = errors.New("fetch failed") diff --git a/go/store/nbs/store_test.go b/go/store/nbs/store_test.go index 98120a2053..2caf830467 100644 --- a/go/store/nbs/store_test.go +++ b/go/store/nbs/store_test.go @@ -27,7 +27,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) func TestNBSAsTableFileStore(t *testing.T) { diff --git a/go/store/nbs/table.go b/go/store/nbs/table.go index ad549afc6f..9d4a5c5954 100644 --- a/go/store/nbs/table.go +++ b/go/store/nbs/table.go @@ -31,9 +31,9 @@ import ( "io" "sync" - "github.com/liquidata-inc/dolt/go/store/atomicerr" - "github.com/liquidata-inc/dolt/go/store/chunks" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/atomicerr" + "github.com/dolthub/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/hash" ) /* diff --git a/go/store/nbs/table_persister.go b/go/store/nbs/table_persister.go index 82c4f17261..6fa768ab5f 100644 --- a/go/store/nbs/table_persister.go +++ b/go/store/nbs/table_persister.go @@ -31,7 +31,7 @@ import ( "sort" "sync" - "github.com/liquidata-inc/dolt/go/store/util/sizecache" + "github.com/dolthub/dolt/go/store/util/sizecache" ) // tablePersister allows interaction with persistent storage. It provides diff --git a/go/store/nbs/table_reader.go b/go/store/nbs/table_reader.go index 5b89c348de..98f6f544a2 100644 --- a/go/store/nbs/table_reader.go +++ b/go/store/nbs/table_reader.go @@ -35,9 +35,9 @@ import ( "github.com/golang/snappy" "github.com/liquidata-inc/mmap-go" - "github.com/liquidata-inc/dolt/go/store/atomicerr" - "github.com/liquidata-inc/dolt/go/store/chunks" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/atomicerr" + "github.com/dolthub/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/hash" ) // CompressedChunk represents a chunk of data in a table file which is still compressed via snappy. diff --git a/go/store/nbs/table_set.go b/go/store/nbs/table_set.go index 1fca7d2f88..5317ee471b 100644 --- a/go/store/nbs/table_set.go +++ b/go/store/nbs/table_set.go @@ -27,9 +27,9 @@ import ( "sync" "sync/atomic" - "github.com/liquidata-inc/dolt/go/store/atomicerr" + "github.com/dolthub/dolt/go/store/atomicerr" - "github.com/liquidata-inc/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/chunks" ) const concurrentCompactions = 5 diff --git a/go/store/nbs/table_test.go b/go/store/nbs/table_test.go index ba24fe0c30..6fc5e9e838 100644 --- a/go/store/nbs/table_test.go +++ b/go/store/nbs/table_test.go @@ -31,9 +31,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/store/atomicerr" - "github.com/liquidata-inc/dolt/go/store/chunks" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/atomicerr" + "github.com/dolthub/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/hash" ) func buildTable(chunks [][]byte) ([]byte, addr, error) { diff --git a/go/store/nbs/table_writer.go b/go/store/nbs/table_writer.go index de5fc936be..f42ea13ac5 100644 --- a/go/store/nbs/table_writer.go +++ b/go/store/nbs/table_writer.go @@ -31,7 +31,7 @@ import ( "github.com/golang/snappy" - "github.com/liquidata-inc/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/d" ) // tableWriter encodes a collection of byte stream chunks into a nbs table. NOT goroutine safe. diff --git a/go/store/nomdl/parser.go b/go/store/nomdl/parser.go index 7102f165c7..891cf8b09c 100644 --- a/go/store/nomdl/parser.go +++ b/go/store/nomdl/parser.go @@ -30,8 +30,8 @@ import ( "strings" "text/scanner" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/types" ) // Parser provides ways to parse Noms types. diff --git a/go/store/nomdl/parser_test.go b/go/store/nomdl/parser_test.go index 1128fac8cc..bbbf2d34b7 100644 --- a/go/store/nomdl/parser_test.go +++ b/go/store/nomdl/parser_test.go @@ -29,9 +29,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/store/chunks" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/types" ) func mustString(str string, err error) string { diff --git a/go/store/perf/codec-perf-rig/main.go b/go/store/perf/codec-perf-rig/main.go index 0338c1f25e..f757f16091 100644 --- a/go/store/perf/codec-perf-rig/main.go +++ b/go/store/perf/codec-perf-rig/main.go @@ -30,11 +30,11 @@ import ( flag "github.com/juju/gnuflag" - "github.com/liquidata-inc/dolt/go/store/chunks" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/datas" - "github.com/liquidata-inc/dolt/go/store/types" - "github.com/liquidata-inc/dolt/go/store/util/profile" + "github.com/dolthub/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/datas" + "github.com/dolthub/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/util/profile" ) var ( diff --git a/go/store/perf/suite/suite.go b/go/store/perf/suite/suite.go index 2928bd4e56..a5191cd2f9 100644 --- a/go/store/perf/suite/suite.go +++ b/go/store/perf/suite/suite.go @@ -110,12 +110,12 @@ import ( "github.com/stretchr/testify/assert" testifySuite "github.com/stretchr/testify/suite" - "github.com/liquidata-inc/dolt/go/libraries/utils/osutil" - "github.com/liquidata-inc/dolt/go/store/chunks" - "github.com/liquidata-inc/dolt/go/store/datas" - "github.com/liquidata-inc/dolt/go/store/marshal" - "github.com/liquidata-inc/dolt/go/store/spec" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/libraries/utils/osutil" + "github.com/dolthub/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/datas" + "github.com/dolthub/dolt/go/store/marshal" + "github.com/dolthub/dolt/go/store/spec" + "github.com/dolthub/dolt/go/store/types" ) var ( diff --git a/go/store/perf/suite/suite_test.go b/go/store/perf/suite/suite_test.go index 8fda4b3870..e3579d5569 100644 --- a/go/store/perf/suite/suite_test.go +++ b/go/store/perf/suite/suite_test.go @@ -30,8 +30,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/store/spec" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/spec" + "github.com/dolthub/dolt/go/store/types" ) type testSuite struct { diff --git a/go/store/sloppy/sloppy.go b/go/store/sloppy/sloppy.go index 94a1262e87..476b3ba8c4 100644 --- a/go/store/sloppy/sloppy.go +++ b/go/store/sloppy/sloppy.go @@ -22,7 +22,7 @@ package sloppy import ( - "github.com/liquidata-inc/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/d" ) const ( diff --git a/go/store/spec/absolute_path.go b/go/store/spec/absolute_path.go index dffc67daa8..99d6bd6632 100644 --- a/go/store/spec/absolute_path.go +++ b/go/store/spec/absolute_path.go @@ -27,11 +27,11 @@ import ( "fmt" "regexp" - "github.com/liquidata-inc/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/datas" - "github.com/liquidata-inc/dolt/go/store/hash" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/datas" + "github.com/dolthub/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/types" ) var datasetCapturePrefixRe = regexp.MustCompile("^(" + datas.DatasetRe.String() + ")") diff --git a/go/store/spec/absolute_path_test.go b/go/store/spec/absolute_path_test.go index cee16b8dd0..4419bb0180 100644 --- a/go/store/spec/absolute_path_test.go +++ b/go/store/spec/absolute_path_test.go @@ -29,10 +29,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/store/chunks" - "github.com/liquidata-inc/dolt/go/store/datas" - "github.com/liquidata-inc/dolt/go/store/hash" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/datas" + "github.com/dolthub/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/types" ) func TestAbsolutePathToAndFromString(t *testing.T) { diff --git a/go/store/spec/commit_meta.go b/go/store/spec/commit_meta.go index 9ea47d09e8..3b99743435 100644 --- a/go/store/spec/commit_meta.go +++ b/go/store/spec/commit_meta.go @@ -29,8 +29,8 @@ import ( flag "github.com/juju/gnuflag" - "github.com/liquidata-inc/dolt/go/store/datas" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/datas" + "github.com/dolthub/dolt/go/store/types" ) const CommitMetaDateFormat = time.RFC3339 diff --git a/go/store/spec/commit_meta_test.go b/go/store/spec/commit_meta_test.go index a97a18a2f5..3ef6879f90 100644 --- a/go/store/spec/commit_meta_test.go +++ b/go/store/spec/commit_meta_test.go @@ -30,9 +30,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/store/chunks" - "github.com/liquidata-inc/dolt/go/store/datas" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/datas" + "github.com/dolthub/dolt/go/store/types" ) func isEmptyStruct(s types.Struct) bool { diff --git a/go/store/spec/spec.go b/go/store/spec/spec.go index c8f6f01030..9c43e64a89 100644 --- a/go/store/spec/spec.go +++ b/go/store/spec/spec.go @@ -40,11 +40,11 @@ import ( "github.com/aws/aws-sdk-go/service/dynamodb" "github.com/aws/aws-sdk-go/service/s3" - "github.com/liquidata-inc/dolt/go/store/chunks" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/datas" - "github.com/liquidata-inc/dolt/go/store/nbs" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/datas" + "github.com/dolthub/dolt/go/store/nbs" + "github.com/dolthub/dolt/go/store/types" ) const ( diff --git a/go/store/spec/spec_test.go b/go/store/spec/spec_test.go index 7f09f3ec61..7959d60029 100644 --- a/go/store/spec/spec_test.go +++ b/go/store/spec/spec_test.go @@ -31,12 +31,12 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/store/chunks" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/datas" - "github.com/liquidata-inc/dolt/go/store/hash" - "github.com/liquidata-inc/dolt/go/store/nbs" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/datas" + "github.com/dolthub/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/nbs" + "github.com/dolthub/dolt/go/store/types" ) func mustValue(val types.Value, err error) types.Value { diff --git a/go/store/spec/util.go b/go/store/spec/util.go index 46ac7b84b3..48fee57593 100644 --- a/go/store/spec/util.go +++ b/go/store/spec/util.go @@ -22,8 +22,8 @@ package spec import ( - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/hash" ) func CreateDatabaseSpecString(protocol, db string) string { diff --git a/go/store/types/apply_map_edits.go b/go/store/types/apply_map_edits.go index b6ea1b8703..1814f90f99 100644 --- a/go/store/types/apply_map_edits.go +++ b/go/store/types/apply_map_edits.go @@ -17,7 +17,7 @@ package types import ( "context" - "github.com/liquidata-inc/dolt/go/store/atomicerr" + "github.com/dolthub/dolt/go/store/atomicerr" ) // EditProvider is an interface which provides map edits as KVPs where each edit is a key and the new value diff --git a/go/store/types/blob.go b/go/store/types/blob.go index 05dc080c15..8a2d92b070 100644 --- a/go/store/types/blob.go +++ b/go/store/types/blob.go @@ -28,9 +28,9 @@ import ( "runtime" "sync" - "github.com/liquidata-inc/dolt/go/store/atomicerr" + "github.com/dolthub/dolt/go/store/atomicerr" - "github.com/liquidata-inc/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/d" ) // Blob represents a list of Blobs. diff --git a/go/store/types/blob_leaf_sequence.go b/go/store/types/blob_leaf_sequence.go index 230eef36e6..fc6f0e9c20 100644 --- a/go/store/types/blob_leaf_sequence.go +++ b/go/store/types/blob_leaf_sequence.go @@ -21,7 +21,7 @@ package types -import "github.com/liquidata-inc/dolt/go/store/d" +import "github.com/dolthub/dolt/go/store/d" type blobLeafSequence struct { leafSequence diff --git a/go/store/types/blob_test.go b/go/store/types/blob_test.go index 429d55de10..f8fb8347f4 100644 --- a/go/store/types/blob_test.go +++ b/go/store/types/blob_test.go @@ -30,7 +30,7 @@ import ( "strings" "testing" - "github.com/liquidata-inc/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/d" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" diff --git a/go/store/types/bool.go b/go/store/types/bool.go index 47d274d7c4..08a31be869 100644 --- a/go/store/types/bool.go +++ b/go/store/types/bool.go @@ -25,7 +25,7 @@ import ( "context" "strconv" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/hash" ) // Bool is a Noms Value wrapper around the primitive bool type. diff --git a/go/store/types/buffered_sequence_iterator.go b/go/store/types/buffered_sequence_iterator.go index 7421498ece..fcca22df51 100644 --- a/go/store/types/buffered_sequence_iterator.go +++ b/go/store/types/buffered_sequence_iterator.go @@ -17,7 +17,7 @@ package types import ( "context" - "github.com/liquidata-inc/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/d" ) type bufferedSequenceIterator struct { diff --git a/go/store/types/codec.go b/go/store/types/codec.go index 6e8b60d672..cb380d458e 100644 --- a/go/store/types/codec.go +++ b/go/store/types/codec.go @@ -25,9 +25,9 @@ import ( "encoding/binary" "math" - "github.com/liquidata-inc/dolt/go/store/chunks" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/hash" ) const initialBufferSize = 2048 diff --git a/go/store/types/collection_test.go b/go/store/types/collection_test.go index fc2f6abb89..ab02065a9b 100644 --- a/go/store/types/collection_test.go +++ b/go/store/types/collection_test.go @@ -24,7 +24,7 @@ package types import ( "github.com/stretchr/testify/suite" - "github.com/liquidata-inc/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/d" ) type collectionTestSuite struct { diff --git a/go/store/types/common_supertype.go b/go/store/types/common_supertype.go index 23a38ea732..883b924b9e 100644 --- a/go/store/types/common_supertype.go +++ b/go/store/types/common_supertype.go @@ -14,7 +14,7 @@ package types -import "github.com/liquidata-inc/dolt/go/store/d" +import "github.com/dolthub/dolt/go/store/d" // ContainCommonSupertype returns true if it's possible to synthesize // a non-trivial (i.e. not empty) supertype from types |a| and |b|. diff --git a/go/store/types/compare_test.go b/go/store/types/compare_test.go index f0fe140bc4..b57e878eb5 100644 --- a/go/store/types/compare_test.go +++ b/go/store/types/compare_test.go @@ -29,8 +29,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/hash" ) const uint32Size = 4 diff --git a/go/store/types/decimal.go b/go/store/types/decimal.go index c43b0ac069..043ea5212a 100644 --- a/go/store/types/decimal.go +++ b/go/store/types/decimal.go @@ -19,7 +19,7 @@ import ( "github.com/shopspring/decimal" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/hash" ) type Decimal decimal.Decimal diff --git a/go/store/types/edits/async_sorted_edits.go b/go/store/types/edits/async_sorted_edits.go index dac74b3be5..00a5765926 100644 --- a/go/store/types/edits/async_sorted_edits.go +++ b/go/store/types/edits/async_sorted_edits.go @@ -17,9 +17,9 @@ package edits import ( "sort" - "github.com/liquidata-inc/dolt/go/store/atomicerr" + "github.com/dolthub/dolt/go/store/atomicerr" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) func sorter(nbf *types.NomsBinFormat, in, out chan types.KVPSlice) error { diff --git a/go/store/types/edits/async_sorted_edits_test.go b/go/store/types/edits/async_sorted_edits_test.go index dee1399c8c..1e3b9eceae 100644 --- a/go/store/types/edits/async_sorted_edits_test.go +++ b/go/store/types/edits/async_sorted_edits_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) func createKVPs(rng *rand.Rand, size int) types.KVPSlice { diff --git a/go/store/types/edits/kvp_coll_builder.go b/go/store/types/edits/kvp_coll_builder.go index 9d35d83abd..02a06873c8 100644 --- a/go/store/types/edits/kvp_coll_builder.go +++ b/go/store/types/edits/kvp_coll_builder.go @@ -14,7 +14,7 @@ package edits -import "github.com/liquidata-inc/dolt/go/store/types" +import "github.com/dolthub/dolt/go/store/types" // KVPCollBuilder is used to build a KVPCollection. It creates two buffers which it fills with KVPs. When a buffer // is filled the target buffer is changed for subsequent adds. New buffers can be added to the builder so that diff --git a/go/store/types/edits/kvp_coll_builder_test.go b/go/store/types/edits/kvp_coll_builder_test.go index e14333969d..5b10fcb7b7 100644 --- a/go/store/types/edits/kvp_coll_builder_test.go +++ b/go/store/types/edits/kvp_coll_builder_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) func TestAddKVP(t *testing.T) { diff --git a/go/store/types/edits/kvp_coll_itr.go b/go/store/types/edits/kvp_coll_itr.go index 0b05d8dc50..0e35a22b29 100644 --- a/go/store/types/edits/kvp_coll_itr.go +++ b/go/store/types/edits/kvp_coll_itr.go @@ -14,7 +14,7 @@ package edits -import "github.com/liquidata-inc/dolt/go/store/types" +import "github.com/dolthub/dolt/go/store/types" // KVPCollItr is a KVPIterator implementation for iterating over a KVPCollection type KVPCollItr struct { diff --git a/go/store/types/edits/kvp_coll_itr_test.go b/go/store/types/edits/kvp_coll_itr_test.go index 150ce1d2ea..f944185bfd 100644 --- a/go/store/types/edits/kvp_coll_itr_test.go +++ b/go/store/types/edits/kvp_coll_itr_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) func TestKVPCollItr(t *testing.T) { diff --git a/go/store/types/edits/kvp_collection.go b/go/store/types/edits/kvp_collection.go index 1f93e5e4e5..cf6a60126b 100644 --- a/go/store/types/edits/kvp_collection.go +++ b/go/store/types/edits/kvp_collection.go @@ -14,7 +14,7 @@ package edits -import "github.com/liquidata-inc/dolt/go/store/types" +import "github.com/dolthub/dolt/go/store/types" // KVPCollection is a collection of sorted KVPs type KVPCollection struct { diff --git a/go/store/types/edits/kvp_collection_test.go b/go/store/types/edits/kvp_collection_test.go index 1249f40192..f55ee3821a 100644 --- a/go/store/types/edits/kvp_collection_test.go +++ b/go/store/types/edits/kvp_collection_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/types" ) func (coll *KVPCollection) String() string { diff --git a/go/store/types/edits/kvp_itr_test.go b/go/store/types/edits/kvp_itr_test.go index 991c5fba63..dd3ab1cd0c 100644 --- a/go/store/types/edits/kvp_itr_test.go +++ b/go/store/types/edits/kvp_itr_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/types" ) // IsInOrder iterates over every value and validates that they are returned in key order. This is intended for testing. diff --git a/go/store/types/edits/sorted_edit_itr.go b/go/store/types/edits/sorted_edit_itr.go index 41bb68d7f1..313e1d6fb4 100644 --- a/go/store/types/edits/sorted_edit_itr.go +++ b/go/store/types/edits/sorted_edit_itr.go @@ -14,7 +14,7 @@ package edits -import "github.com/liquidata-inc/dolt/go/store/types" +import "github.com/dolthub/dolt/go/store/types" // SortedEditItr is a KVPIterator implementation that takes two KVPCollItr and merges them as it iterates type SortedEditItr struct { diff --git a/go/store/types/encode_human_readable.go b/go/store/types/encode_human_readable.go index ab5fda4614..74313babb8 100644 --- a/go/store/types/encode_human_readable.go +++ b/go/store/types/encode_human_readable.go @@ -31,8 +31,8 @@ import ( "github.com/dustin/go-humanize" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/util/writers" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/util/writers" ) // Clients can register a 'commenter' to return a comment that will get appended diff --git a/go/store/types/encode_human_readable_test.go b/go/store/types/encode_human_readable_test.go index 32b67a8ca8..44a0f6d1f7 100644 --- a/go/store/types/encode_human_readable_test.go +++ b/go/store/types/encode_human_readable_test.go @@ -30,9 +30,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/util/test" - "github.com/liquidata-inc/dolt/go/store/util/writers" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/util/test" + "github.com/dolthub/dolt/go/store/util/writers" ) func assertWriteHRSEqual(t *testing.T, expected string, v Value) { diff --git a/go/store/types/encoding_test.go b/go/store/types/encoding_test.go index 351971fc46..6f0f02c703 100644 --- a/go/store/types/encoding_test.go +++ b/go/store/types/encoding_test.go @@ -31,7 +31,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/hash" ) func toBinaryNomsReaderData(data []interface{}) []byte { diff --git a/go/store/types/float.go b/go/store/types/float.go index 73fc90a054..7e35c701d9 100644 --- a/go/store/types/float.go +++ b/go/store/types/float.go @@ -25,7 +25,7 @@ import ( "context" "strconv" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/hash" ) // Float is a Noms Value wrapper around the primitive float64 type. diff --git a/go/store/types/format.go b/go/store/types/format.go index 6c7eced2b6..3302a593a4 100644 --- a/go/store/types/format.go +++ b/go/store/types/format.go @@ -17,7 +17,7 @@ package types import ( "errors" - "github.com/liquidata-inc/dolt/go/store/constants" + "github.com/dolthub/dolt/go/store/constants" ) func init() { diff --git a/go/store/types/get_hash.go b/go/store/types/get_hash.go index 22e4a68ce8..b49ebcdce6 100644 --- a/go/store/types/get_hash.go +++ b/go/store/types/get_hash.go @@ -21,7 +21,7 @@ package types -import "github.com/liquidata-inc/dolt/go/store/hash" +import "github.com/dolthub/dolt/go/store/hash" var getHashOverride func(v Value) (hash.Hash, error) diff --git a/go/store/types/incremental_test.go b/go/store/types/incremental_test.go index fe0e34575d..e03b8e9f14 100644 --- a/go/store/types/incremental_test.go +++ b/go/store/types/incremental_test.go @@ -28,7 +28,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/chunks" ) func getTestVals(vrw ValueReadWriter) []Value { diff --git a/go/store/types/indexed_sequences.go b/go/store/types/indexed_sequences.go index 560b3177ab..4af35f6f48 100644 --- a/go/store/types/indexed_sequences.go +++ b/go/store/types/indexed_sequences.go @@ -25,8 +25,8 @@ import ( "context" "fmt" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/hash" ) func newListMetaSequence(level uint64, tuples []metaTuple, vrw ValueReadWriter) (metaSequence, error) { diff --git a/go/store/types/inlineblob.go b/go/store/types/inlineblob.go index 955e8087cf..a5cfe1f85a 100644 --- a/go/store/types/inlineblob.go +++ b/go/store/types/inlineblob.go @@ -22,7 +22,7 @@ import ( "math" "strings" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/hash" ) type InlineBlob []byte diff --git a/go/store/types/int.go b/go/store/types/int.go index 8effd84717..0977ce4f1c 100644 --- a/go/store/types/int.go +++ b/go/store/types/int.go @@ -25,7 +25,7 @@ import ( "context" "strconv" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/hash" ) // Int is a Noms Value wrapper around the primitive int32 type. diff --git a/go/store/types/leaf_sequence.go b/go/store/types/leaf_sequence.go index cce6d767fa..d503fd6bba 100644 --- a/go/store/types/leaf_sequence.go +++ b/go/store/types/leaf_sequence.go @@ -25,7 +25,7 @@ import ( "context" "math" - "github.com/liquidata-inc/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/d" ) type leafSequence struct { diff --git a/go/store/types/less.go b/go/store/types/less.go index 9995ec58bb..d7bc0cb373 100644 --- a/go/store/types/less.go +++ b/go/store/types/less.go @@ -22,7 +22,7 @@ package types import ( - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/hash" ) type kindAndHash interface { diff --git a/go/store/types/list.go b/go/store/types/list.go index 40a117265d..8b9c33c53d 100644 --- a/go/store/types/list.go +++ b/go/store/types/list.go @@ -25,9 +25,9 @@ import ( "context" "sync/atomic" - "github.com/liquidata-inc/dolt/go/store/atomicerr" + "github.com/dolthub/dolt/go/store/atomicerr" - "github.com/liquidata-inc/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/d" ) var EmptyList List diff --git a/go/store/types/list_editor.go b/go/store/types/list_editor.go index 64736622c8..2f845fd20e 100644 --- a/go/store/types/list_editor.go +++ b/go/store/types/list_editor.go @@ -25,9 +25,9 @@ import ( "context" "sync" - "github.com/liquidata-inc/dolt/go/store/atomicerr" + "github.com/dolthub/dolt/go/store/atomicerr" - "github.com/liquidata-inc/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/d" ) type ListEditor struct { diff --git a/go/store/types/list_iterator.go b/go/store/types/list_iterator.go index 3763071405..0f6714ab4e 100644 --- a/go/store/types/list_iterator.go +++ b/go/store/types/list_iterator.go @@ -24,7 +24,7 @@ package types import ( "context" - "github.com/liquidata-inc/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/d" ) // ListIterator can be used to efficiently iterate through a Noms List. diff --git a/go/store/types/list_test.go b/go/store/types/list_test.go index f59681c22c..df18c3f99e 100644 --- a/go/store/types/list_test.go +++ b/go/store/types/list_test.go @@ -29,9 +29,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" - "github.com/liquidata-inc/dolt/go/store/atomicerr" - "github.com/liquidata-inc/dolt/go/store/chunks" - "github.com/liquidata-inc/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/atomicerr" + "github.com/dolthub/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/d" ) const testListSize = 5000 diff --git a/go/store/types/make_type.go b/go/store/types/make_type.go index 6da6eca44f..d80a737a93 100644 --- a/go/store/types/make_type.go +++ b/go/store/types/make_type.go @@ -24,7 +24,7 @@ package types import ( "sort" - "github.com/liquidata-inc/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/d" ) func MakePrimitiveType(k NomsKind) (*Type, error) { diff --git a/go/store/types/map.go b/go/store/types/map.go index 62765f4986..770794d7ee 100644 --- a/go/store/types/map.go +++ b/go/store/types/map.go @@ -26,8 +26,8 @@ import ( "errors" "fmt" - "github.com/liquidata-inc/dolt/go/store/atomicerr" - "github.com/liquidata-inc/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/atomicerr" + "github.com/dolthub/dolt/go/store/d" ) var ErrKeysNotOrdered = errors.New("streaming map keys not ordered") diff --git a/go/store/types/map_editor.go b/go/store/types/map_editor.go index 9118cd7da9..9a44119028 100644 --- a/go/store/types/map_editor.go +++ b/go/store/types/map_editor.go @@ -24,7 +24,7 @@ package types import ( "context" - "github.com/liquidata-inc/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/d" ) // CreateEditAcc defines a factory method for EditAccumulator creation diff --git a/go/store/types/map_leaf_sequence.go b/go/store/types/map_leaf_sequence.go index 89de5daa51..5b3a98641a 100644 --- a/go/store/types/map_leaf_sequence.go +++ b/go/store/types/map_leaf_sequence.go @@ -22,7 +22,7 @@ package types import ( - "github.com/liquidata-inc/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/d" ) type mapLeafSequence struct { diff --git a/go/store/types/map_test.go b/go/store/types/map_test.go index c40ecf3877..8433e6acfd 100644 --- a/go/store/types/map_test.go +++ b/go/store/types/map_test.go @@ -35,9 +35,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" - "github.com/liquidata-inc/dolt/go/store/atomicerr" - "github.com/liquidata-inc/dolt/go/store/chunks" - "github.com/liquidata-inc/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/atomicerr" + "github.com/dolthub/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/d" ) const testMapSize = 8000 diff --git a/go/store/types/meta_sequence.go b/go/store/types/meta_sequence.go index 81db3af9cd..38da4ba93d 100644 --- a/go/store/types/meta_sequence.go +++ b/go/store/types/meta_sequence.go @@ -25,8 +25,8 @@ import ( "context" "fmt" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/hash" ) var emptyKey = orderedKey{} diff --git a/go/store/types/must_test.go b/go/store/types/must_test.go index e28012fd4c..f9c2854524 100644 --- a/go/store/types/must_test.go +++ b/go/store/types/must_test.go @@ -15,8 +15,8 @@ package types import ( - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/hash" ) func mustRef(ref Ref, err error) Ref { diff --git a/go/store/types/null_value.go b/go/store/types/null_value.go index 9a4b76a3c5..44909058ea 100644 --- a/go/store/types/null_value.go +++ b/go/store/types/null_value.go @@ -24,7 +24,7 @@ package types import ( "context" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/hash" ) var NullValue Null diff --git a/go/store/types/ordered_sequences.go b/go/store/types/ordered_sequences.go index ffd8f9f11f..34dca83ef4 100644 --- a/go/store/types/ordered_sequences.go +++ b/go/store/types/ordered_sequences.go @@ -24,7 +24,7 @@ package types import ( "context" - "github.com/liquidata-inc/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/d" ) type orderedSequence interface { diff --git a/go/store/types/ordered_sequences_diff.go b/go/store/types/ordered_sequences_diff.go index 5828a4945e..3afca52860 100644 --- a/go/store/types/ordered_sequences_diff.go +++ b/go/store/types/ordered_sequences_diff.go @@ -25,10 +25,10 @@ import ( "context" "sync" - "github.com/liquidata-inc/dolt/go/store/atomicerr" + "github.com/dolthub/dolt/go/store/atomicerr" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/util/functions" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/util/functions" ) type DiffChangeType uint8 diff --git a/go/store/types/ordered_sequences_diff_test.go b/go/store/types/ordered_sequences_diff_test.go index 7b7fa58faa..5634e157b4 100644 --- a/go/store/types/ordered_sequences_diff_test.go +++ b/go/store/types/ordered_sequences_diff_test.go @@ -25,7 +25,7 @@ import ( "context" "testing" - "github.com/liquidata-inc/dolt/go/store/atomicerr" + "github.com/dolthub/dolt/go/store/atomicerr" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" diff --git a/go/store/types/path.go b/go/store/types/path.go index 5bd987c16d..ceb908c513 100644 --- a/go/store/types/path.go +++ b/go/store/types/path.go @@ -31,8 +31,8 @@ import ( "strconv" "strings" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/hash" ) // For an annotation like @type, 1st capture group is the annotation. diff --git a/go/store/types/path_test.go b/go/store/types/path_test.go index 2e33d60402..ccdc9d8380 100644 --- a/go/store/types/path_test.go +++ b/go/store/types/path_test.go @@ -29,7 +29,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/hash" ) func hashIdx(v Value) string { diff --git a/go/store/types/perf/perf_test.go b/go/store/types/perf/perf_test.go index d394f29731..d8c6e94b8d 100644 --- a/go/store/types/perf/perf_test.go +++ b/go/store/types/perf/perf_test.go @@ -31,9 +31,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/store/atomicerr" - "github.com/liquidata-inc/dolt/go/store/perf/suite" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/atomicerr" + "github.com/dolthub/dolt/go/store/perf/suite" + "github.com/dolthub/dolt/go/store/types" ) type perfSuite struct { diff --git a/go/store/types/ref.go b/go/store/types/ref.go index 89c3a49d32..ccfe082b1d 100644 --- a/go/store/types/ref.go +++ b/go/store/types/ref.go @@ -25,7 +25,7 @@ import ( "bytes" "context" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/hash" ) type Ref struct { diff --git a/go/store/types/ref_heap.go b/go/store/types/ref_heap.go index e181b9ad1b..2e375729b3 100644 --- a/go/store/types/ref_heap.go +++ b/go/store/types/ref_heap.go @@ -24,7 +24,7 @@ package types import ( "sort" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/hash" ) // RefByHeight implements sort.Interface to order by increasing HeightOrder(). It uses increasing order because this causes repeated pushes and pops of the 'tallest' Refs to re-use memory, avoiding reallocations. diff --git a/go/store/types/rolling_value_hasher.go b/go/store/types/rolling_value_hasher.go index 11678c67b0..e93448eebb 100644 --- a/go/store/types/rolling_value_hasher.go +++ b/go/store/types/rolling_value_hasher.go @@ -24,7 +24,7 @@ package types import ( "sync" - "github.com/liquidata-inc/dolt/go/store/sloppy" + "github.com/dolthub/dolt/go/store/sloppy" "github.com/kch42/buzhash" ) diff --git a/go/store/types/sequence.go b/go/store/types/sequence.go index 74d4d7de2e..a4f50f2d16 100644 --- a/go/store/types/sequence.go +++ b/go/store/types/sequence.go @@ -24,8 +24,8 @@ package types import ( "context" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/hash" ) type sequenceItem interface{} diff --git a/go/store/types/sequence_chunker.go b/go/store/types/sequence_chunker.go index b928bdc36b..1d05fd3a0e 100644 --- a/go/store/types/sequence_chunker.go +++ b/go/store/types/sequence_chunker.go @@ -24,7 +24,7 @@ package types import ( "context" - "github.com/liquidata-inc/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/d" ) type hashValueBytesFn func(item sequenceItem, rv *rollingValueHasher) error diff --git a/go/store/types/sequence_concat.go b/go/store/types/sequence_concat.go index bbb184a5cf..42e014bcbd 100644 --- a/go/store/types/sequence_concat.go +++ b/go/store/types/sequence_concat.go @@ -24,7 +24,7 @@ package types import ( "context" - "github.com/liquidata-inc/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/d" ) type newSequenceChunkerFn func(cur *sequenceCursor, vrw ValueReadWriter) (*sequenceChunker, error) diff --git a/go/store/types/sequence_cursor.go b/go/store/types/sequence_cursor.go index c19ece04d9..5fea2880aa 100644 --- a/go/store/types/sequence_cursor.go +++ b/go/store/types/sequence_cursor.go @@ -25,7 +25,7 @@ import ( "context" "fmt" - "github.com/liquidata-inc/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/d" ) type sequenceIterator interface { diff --git a/go/store/types/sequence_cursor_test.go b/go/store/types/sequence_cursor_test.go index 9dcddf3c27..27fd365a9b 100644 --- a/go/store/types/sequence_cursor_test.go +++ b/go/store/types/sequence_cursor_test.go @@ -27,7 +27,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/hash" ) type testSequence struct { diff --git a/go/store/types/set.go b/go/store/types/set.go index 1e4cb934a3..3cf7c9e8e7 100644 --- a/go/store/types/set.go +++ b/go/store/types/set.go @@ -25,8 +25,8 @@ import ( "context" "fmt" - "github.com/liquidata-inc/dolt/go/store/atomicerr" - "github.com/liquidata-inc/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/atomicerr" + "github.com/dolthub/dolt/go/store/d" ) var EmptySet Set diff --git a/go/store/types/set_editor.go b/go/store/types/set_editor.go index 81c5056bb7..a28a5de591 100644 --- a/go/store/types/set_editor.go +++ b/go/store/types/set_editor.go @@ -24,8 +24,8 @@ package types import ( "context" - "github.com/liquidata-inc/dolt/go/store/atomicerr" - "github.com/liquidata-inc/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/atomicerr" + "github.com/dolthub/dolt/go/store/d" ) // SetEditor allows for efficient editing of Set-typed prolly trees. Edits diff --git a/go/store/types/set_iterator.go b/go/store/types/set_iterator.go index 4a24bfea6b..07c1877dbb 100644 --- a/go/store/types/set_iterator.go +++ b/go/store/types/set_iterator.go @@ -24,7 +24,7 @@ package types import ( "context" - "github.com/liquidata-inc/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/d" ) // SetIterator defines methods that can be used to efficiently iterate through a set in 'Noms-defined' diff --git a/go/store/types/set_test.go b/go/store/types/set_test.go index b5113092a6..67407f2523 100644 --- a/go/store/types/set_test.go +++ b/go/store/types/set_test.go @@ -29,7 +29,7 @@ import ( "sync" "testing" - "github.com/liquidata-inc/dolt/go/store/atomicerr" + "github.com/dolthub/dolt/go/store/atomicerr" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" diff --git a/go/store/types/simplify.go b/go/store/types/simplify.go index 1960377b02..9a73136a91 100644 --- a/go/store/types/simplify.go +++ b/go/store/types/simplify.go @@ -17,7 +17,7 @@ package types import ( "sort" - "github.com/liquidata-inc/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/d" ) // simplifyType returns a type that is a super type of the input type but is diff --git a/go/store/types/string.go b/go/store/types/string.go index ca9578d8a8..26c3a70f2e 100644 --- a/go/store/types/string.go +++ b/go/store/types/string.go @@ -27,7 +27,7 @@ import ( "fmt" "strconv" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/hash" ) // String is a Noms Value wrapper around the primitive string type. diff --git a/go/store/types/struct.go b/go/store/types/struct.go index 0a2e9e3365..9fe3ff7c6b 100644 --- a/go/store/types/struct.go +++ b/go/store/types/struct.go @@ -29,7 +29,7 @@ import ( "sort" "strings" - "github.com/liquidata-inc/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/d" ) var EmptyStructType, _ = MakeStructType("") diff --git a/go/store/types/subtype_test.go b/go/store/types/subtype_test.go index cc87abd296..04345caaad 100644 --- a/go/store/types/subtype_test.go +++ b/go/store/types/subtype_test.go @@ -30,7 +30,7 @@ import ( "github.com/google/uuid" "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/d" ) func assertSubtype(ctx context.Context, nbf *NomsBinFormat, t *Type, v Value) { diff --git a/go/store/types/timestamp.go b/go/store/types/timestamp.go index d9adaa7f9e..4558b5473f 100644 --- a/go/store/types/timestamp.go +++ b/go/store/types/timestamp.go @@ -18,7 +18,7 @@ import ( "context" "time" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/hash" ) const ( diff --git a/go/store/types/tuple.go b/go/store/types/tuple.go index 03fb1a8362..69d8ed54f5 100644 --- a/go/store/types/tuple.go +++ b/go/store/types/tuple.go @@ -26,7 +26,7 @@ import ( "context" "fmt" - "github.com/liquidata-inc/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/d" ) func EmptyTuple(nbf *NomsBinFormat) Tuple { diff --git a/go/store/types/type.go b/go/store/types/type.go index c493884f3b..07cba99909 100644 --- a/go/store/types/type.go +++ b/go/store/types/type.go @@ -25,9 +25,9 @@ package types import ( "context" - "github.com/liquidata-inc/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/hash" ) // Type defines and describes Noms types, both built-in and user-defined. diff --git a/go/store/types/uint.go b/go/store/types/uint.go index 62539f4fa0..7e74ff1a9f 100644 --- a/go/store/types/uint.go +++ b/go/store/types/uint.go @@ -25,7 +25,7 @@ import ( "context" "strconv" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/hash" ) // Int is a Noms Value wrapper around the primitive int32 type. diff --git a/go/store/types/util_test.go b/go/store/types/util_test.go index d1720507ad..1efc579714 100644 --- a/go/store/types/util_test.go +++ b/go/store/types/util_test.go @@ -24,8 +24,8 @@ package types import ( "context" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/hash" ) type iterator interface { diff --git a/go/store/types/uuid.go b/go/store/types/uuid.go index 1faf45671b..758b36e421 100644 --- a/go/store/types/uuid.go +++ b/go/store/types/uuid.go @@ -19,7 +19,7 @@ import ( "github.com/google/uuid" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/hash" ) const ( diff --git a/go/store/types/validating_decoder.go b/go/store/types/validating_decoder.go index aad64051c5..b709de0be9 100644 --- a/go/store/types/validating_decoder.go +++ b/go/store/types/validating_decoder.go @@ -22,8 +22,8 @@ package types import ( - "github.com/liquidata-inc/dolt/go/store/chunks" - "github.com/liquidata-inc/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/d" ) type ValidatingDecoder struct { diff --git a/go/store/types/validating_decoder_test.go b/go/store/types/validating_decoder_test.go index 80396e525b..a711108d65 100644 --- a/go/store/types/validating_decoder_test.go +++ b/go/store/types/validating_decoder_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/chunks" ) func TestValidatingBatchingSinkDecode(t *testing.T) { diff --git a/go/store/types/value.go b/go/store/types/value.go index a0f08666f2..62cd067c0d 100644 --- a/go/store/types/value.go +++ b/go/store/types/value.go @@ -25,7 +25,7 @@ import ( "bytes" "context" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/hash" ) type ValueCallback func(v Value) error diff --git a/go/store/types/value_decoder.go b/go/store/types/value_decoder.go index 3c4fd521a3..fca301bfc1 100644 --- a/go/store/types/value_decoder.go +++ b/go/store/types/value_decoder.go @@ -24,7 +24,7 @@ package types import ( "errors" - "github.com/liquidata-inc/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/d" ) var ErrUnknownType = errors.New("unknown type") diff --git a/go/store/types/value_stats.go b/go/store/types/value_stats.go index 411f1ff6f5..039f19a2bb 100644 --- a/go/store/types/value_stats.go +++ b/go/store/types/value_stats.go @@ -29,7 +29,7 @@ import ( humanize "github.com/dustin/go-humanize" "github.com/golang/snappy" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/hash" ) type ValueStats interface { diff --git a/go/store/types/value_store.go b/go/store/types/value_store.go index 104c5eff98..7d427bf225 100644 --- a/go/store/types/value_store.go +++ b/go/store/types/value_store.go @@ -26,12 +26,12 @@ import ( "errors" "sync" - "github.com/liquidata-inc/dolt/go/store/atomicerr" + "github.com/dolthub/dolt/go/store/atomicerr" - "github.com/liquidata-inc/dolt/go/store/chunks" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/hash" - "github.com/liquidata-inc/dolt/go/store/util/sizecache" + "github.com/dolthub/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/util/sizecache" ) // ValueReader is an interface that knows how to read Noms Values, e.g. diff --git a/go/store/types/value_store_test.go b/go/store/types/value_store_test.go index fcffac2ac1..84df5ac34b 100644 --- a/go/store/types/value_store_test.go +++ b/go/store/types/value_store_test.go @@ -27,8 +27,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/store/chunks" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/hash" ) func TestValueReadWriteRead(t *testing.T) { diff --git a/go/store/types/walk.go b/go/store/types/walk.go index b9b2e8f7ae..afa4a739a7 100644 --- a/go/store/types/walk.go +++ b/go/store/types/walk.go @@ -24,7 +24,7 @@ package types import ( "context" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/hash" ) type SkipValueCallback func(v Value) bool diff --git a/go/store/types/walk_refs.go b/go/store/types/walk_refs.go index 6edc5e9c16..42dab27621 100644 --- a/go/store/types/walk_refs.go +++ b/go/store/types/walk_refs.go @@ -22,8 +22,8 @@ package types import ( - "github.com/liquidata-inc/dolt/go/store/chunks" - "github.com/liquidata-inc/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/d" ) // WalkRefs calls cb() on each Ref that can be decoded from |c|. The results diff --git a/go/store/types/walk_refs_test.go b/go/store/types/walk_refs_test.go index ade850a2dc..bb46057c24 100644 --- a/go/store/types/walk_refs_test.go +++ b/go/store/types/walk_refs_test.go @@ -30,7 +30,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/hash" ) func TestWalkRefs(t *testing.T) { diff --git a/go/store/types/walk_test.go b/go/store/types/walk_test.go index e7d712a30e..4c6e89d655 100644 --- a/go/store/types/walk_test.go +++ b/go/store/types/walk_test.go @@ -28,7 +28,7 @@ import ( "github.com/stretchr/testify/suite" - "github.com/liquidata-inc/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/chunks" ) func TestWalkTestSuite(t *testing.T) { diff --git a/go/store/util/clienttest/client_test_suite.go b/go/store/util/clienttest/client_test_suite.go index ab86405592..633135dd8b 100644 --- a/go/store/util/clienttest/client_test_suite.go +++ b/go/store/util/clienttest/client_test_suite.go @@ -29,9 +29,9 @@ import ( flag "github.com/juju/gnuflag" "github.com/stretchr/testify/suite" - "github.com/liquidata-inc/dolt/go/libraries/utils/osutil" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/util/exit" + "github.com/dolthub/dolt/go/libraries/utils/osutil" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/util/exit" ) const DefaultMemTableSize = 8 * (1 << 20) // 8MB diff --git a/go/store/util/datetime/date_time.go b/go/store/util/datetime/date_time.go index 1a64f3d429..31453b433a 100644 --- a/go/store/util/datetime/date_time.go +++ b/go/store/util/datetime/date_time.go @@ -28,8 +28,8 @@ import ( "math" "time" - "github.com/liquidata-inc/dolt/go/store/marshal" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/marshal" + "github.com/dolthub/dolt/go/store/types" ) const ( diff --git a/go/store/util/datetime/date_time_test.go b/go/store/util/datetime/date_time_test.go index cf5f9e6b48..0fb821db50 100644 --- a/go/store/util/datetime/date_time_test.go +++ b/go/store/util/datetime/date_time_test.go @@ -29,10 +29,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/store/chunks" - "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/dolt/go/store/marshal" - "github.com/liquidata-inc/dolt/go/store/types" + "github.com/dolthub/dolt/go/store/chunks" + "github.com/dolthub/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/marshal" + "github.com/dolthub/dolt/go/store/types" ) func TestBasics(t *testing.T) { diff --git a/go/store/util/outputpager/page_output.go b/go/store/util/outputpager/page_output.go index e1a5fc0fbe..879ae8a275 100644 --- a/go/store/util/outputpager/page_output.go +++ b/go/store/util/outputpager/page_output.go @@ -30,7 +30,7 @@ import ( flag "github.com/juju/gnuflag" goisatty "github.com/mattn/go-isatty" - "github.com/liquidata-inc/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/d" ) var ( diff --git a/go/store/util/profile/profile.go b/go/store/util/profile/profile.go index c6782bde93..9885dd0091 100644 --- a/go/store/util/profile/profile.go +++ b/go/store/util/profile/profile.go @@ -29,7 +29,7 @@ import ( flag "github.com/juju/gnuflag" - "github.com/liquidata-inc/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/d" ) var ( diff --git a/go/store/util/progressreader/reader.go b/go/store/util/progressreader/reader.go index 230d6f17af..c075be540e 100644 --- a/go/store/util/progressreader/reader.go +++ b/go/store/util/progressreader/reader.go @@ -26,7 +26,7 @@ import ( "io" "time" - "github.com/liquidata-inc/dolt/go/store/util/status" + "github.com/dolthub/dolt/go/store/util/status" ) type Callback func(seen uint64) diff --git a/go/store/util/random/id.go b/go/store/util/random/id.go index 8311ca2dad..4444cacaa9 100644 --- a/go/store/util/random/id.go +++ b/go/store/util/random/id.go @@ -18,7 +18,7 @@ import ( "crypto/rand" "encoding/hex" - "github.com/liquidata-inc/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/d" ) var ( diff --git a/go/store/util/sizecache/size_cache.go b/go/store/util/sizecache/size_cache.go index 5cab11e505..70338d0ad3 100644 --- a/go/store/util/sizecache/size_cache.go +++ b/go/store/util/sizecache/size_cache.go @@ -29,7 +29,7 @@ import ( "container/list" "sync" - "github.com/liquidata-inc/dolt/go/store/d" + "github.com/dolthub/dolt/go/store/d" ) type sizeCacheEntry struct { diff --git a/go/store/util/sizecache/size_cache_test.go b/go/store/util/sizecache/size_cache_test.go index 193c35bebd..475108a4c3 100644 --- a/go/store/util/sizecache/size_cache_test.go +++ b/go/store/util/sizecache/size_cache_test.go @@ -29,7 +29,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/hash" ) func hashFromString(s string) hash.Hash { diff --git a/go/store/util/test/equals_ignore_hashes.go b/go/store/util/test/equals_ignore_hashes.go index 394fa56199..5768507d06 100644 --- a/go/store/util/test/equals_ignore_hashes.go +++ b/go/store/util/test/equals_ignore_hashes.go @@ -29,7 +29,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/hash" ) var pattern = regexp.MustCompile("([0-9a-v]{" + strconv.Itoa(hash.StringLen) + "})") diff --git a/go/utils/publishrelease/install.sh b/go/utils/publishrelease/install.sh index 29fb8f4f83..0dab3acc80 100644 --- a/go/utils/publishrelease/install.sh +++ b/go/utils/publishrelease/install.sh @@ -4,7 +4,7 @@ # It should be run as root, and can be run directly from a GitHub # release, for example as: # -# curl https://github.com/liquidata-inc/dolt/releases/download/v__DOLT_VERSION__/install.sh | sudo bash +# curl https://github.com/dolthub/dolt/releases/download/v__DOLT_VERSION__/install.sh | sudo bash # # All downloads occur over HTTPS from the Github releases page. @@ -18,7 +18,7 @@ _() { set -euo pipefail DOLT_VERSION=__DOLT_VERSION__ -RELEASES_BASE_URL=https://github.com/liquidata-inc/dolt/releases/download/v"$DOLT_VERSION" +RELEASES_BASE_URL=https://github.com/dolthub/dolt/releases/download/v"$DOLT_VERSION" INSTALL_URL=$RELEASES_BASE_URL/install.sh CURL_USER_AGENT=${CURL_USER_AGENT:-dolt-installer} diff --git a/go/utils/remotesrv/cscache.go b/go/utils/remotesrv/cscache.go index b4fca3f813..ddbdd8cc77 100644 --- a/go/utils/remotesrv/cscache.go +++ b/go/utils/remotesrv/cscache.go @@ -19,8 +19,8 @@ import ( "path/filepath" "sync" - "github.com/liquidata-inc/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/dolt/go/store/nbs" + "github.com/dolthub/dolt/go/libraries/utils/filesys" + "github.com/dolthub/dolt/go/store/nbs" ) const ( diff --git a/go/utils/remotesrv/grpc.go b/go/utils/remotesrv/grpc.go index e81371daae..86c06b4f9c 100644 --- a/go/utils/remotesrv/grpc.go +++ b/go/utils/remotesrv/grpc.go @@ -25,11 +25,11 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - remotesapi "github.com/liquidata-inc/dolt/go/gen/proto/dolt/services/remotesapi/v1alpha1" - "github.com/liquidata-inc/dolt/go/libraries/doltcore/remotestorage" - "github.com/liquidata-inc/dolt/go/store/hash" - "github.com/liquidata-inc/dolt/go/store/nbs" - "github.com/liquidata-inc/dolt/go/store/types" + remotesapi "github.com/dolthub/dolt/go/gen/proto/dolt/services/remotesapi/v1alpha1" + "github.com/dolthub/dolt/go/libraries/doltcore/remotestorage" + "github.com/dolthub/dolt/go/store/hash" + "github.com/dolthub/dolt/go/store/nbs" + "github.com/dolthub/dolt/go/store/types" ) type RemoteChunkStore struct { diff --git a/go/utils/remotesrv/http.go b/go/utils/remotesrv/http.go index 7416f69260..97a4b6c6bd 100644 --- a/go/utils/remotesrv/http.go +++ b/go/utils/remotesrv/http.go @@ -27,10 +27,10 @@ import ( "strconv" "strings" - remotesapi "github.com/liquidata-inc/dolt/go/gen/proto/dolt/services/remotesapi/v1alpha1" + remotesapi "github.com/dolthub/dolt/go/gen/proto/dolt/services/remotesapi/v1alpha1" - "github.com/liquidata-inc/dolt/go/libraries/utils/iohelp" - "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/dolthub/dolt/go/libraries/utils/iohelp" + "github.com/dolthub/dolt/go/store/hash" ) var expectedFiles = make(map[string]*remotesapi.TableFileDetails) diff --git a/go/utils/remotesrv/main.go b/go/utils/remotesrv/main.go index 91fbf87f92..91bc2c7581 100644 --- a/go/utils/remotesrv/main.go +++ b/go/utils/remotesrv/main.go @@ -27,8 +27,8 @@ import ( "google.golang.org/grpc" - remotesapi "github.com/liquidata-inc/dolt/go/gen/proto/dolt/services/remotesapi/v1alpha1" - "github.com/liquidata-inc/dolt/go/libraries/utils/filesys" + remotesapi "github.com/dolthub/dolt/go/gen/proto/dolt/services/remotesapi/v1alpha1" + "github.com/dolthub/dolt/go/libraries/utils/filesys" ) func main() { diff --git a/go/utils/repofmt/check_fmt.sh b/go/utils/repofmt/check_fmt.sh index 9dbdb5860a..581e42b084 100755 --- a/go/utils/repofmt/check_fmt.sh +++ b/go/utils/repofmt/check_fmt.sh @@ -9,7 +9,7 @@ go install golang.org/x/tools/cmd/goimports paths=`find . -maxdepth 1 -mindepth 1 \( -name gen -prune -o -type d -print -o -type f -name '*.go' -print \)` -bad_files=$(goimports -l -local github.com/liquidata-inc/dolt $paths) +bad_files=$(goimports -l -local github.com/dolthub/dolt $paths) if [ "$bad_files" != "" ]; then echo "ERROR: The following files do not match goimports output:" echo "$bad_files" diff --git a/go/utils/repofmt/format_repo.sh b/go/utils/repofmt/format_repo.sh index 22cf3954b3..79b8ea5321 100755 --- a/go/utils/repofmt/format_repo.sh +++ b/go/utils/repofmt/format_repo.sh @@ -7,7 +7,7 @@ cd $script_dir/../.. paths=`find . -maxdepth 1 -mindepth 1 \( -name gen -prune -o -type d -print -o -type f -name '*.go' -print \)` -goimports -w -local github.com/liquidata-inc/dolt $paths +goimports -w -local github.com/dolthub/dolt $paths bad_files=$(find $paths -name '*.go' | while read f; do if [[ $(awk '/import \(/{flag=1;next}/\)/{flag=0}flag' < $f | egrep -c '$^') -gt 2 ]]; then @@ -20,5 +20,5 @@ if [ "$bad_files" != "" ]; then awk '/import \(/{flag=1}/\)/{flag=0}flag&&!/^$/||!flag' < "$f" > "$f.bak" mv "$f.bak" "$f" done - goimports -w -local github.com/liquidata-inc/dolt . + goimports -w -local github.com/dolthub/dolt . fi diff --git a/proto/dolt/services/eventsapi/v1alpha1/client_event.proto b/proto/dolt/services/eventsapi/v1alpha1/client_event.proto index e00f2f7ba2..2b42480d2c 100644 --- a/proto/dolt/services/eventsapi/v1alpha1/client_event.proto +++ b/proto/dolt/services/eventsapi/v1alpha1/client_event.proto @@ -18,7 +18,7 @@ syntax = "proto3"; package dolt.services.eventsapi.v1alpha1; -option go_package = "github.com/liquidata-inc/dolt/go/gen/proto/dolt/services/eventsapi/v1alpha1;eventsapi"; +option go_package = "github.com/dolthub/dolt/go/gen/proto/dolt/services/eventsapi/v1alpha1;eventsapi"; import "dolt/services/eventsapi/v1alpha1/event_constants.proto"; import "google/protobuf/duration.proto"; diff --git a/proto/dolt/services/eventsapi/v1alpha1/event_constants.proto b/proto/dolt/services/eventsapi/v1alpha1/event_constants.proto index e9dea61be6..431d4aed3d 100644 --- a/proto/dolt/services/eventsapi/v1alpha1/event_constants.proto +++ b/proto/dolt/services/eventsapi/v1alpha1/event_constants.proto @@ -18,7 +18,7 @@ syntax = "proto3"; package dolt.services.eventsapi.v1alpha1; -option go_package = "github.com/liquidata-inc/dolt/go/gen/proto/dolt/services/eventsapi/v1alpha1;eventsapi"; +option go_package = "github.com/dolthub/dolt/go/gen/proto/dolt/services/eventsapi/v1alpha1;eventsapi"; enum Platform { PLATFORM_UNSPECIFIED = 0; diff --git a/proto/dolt/services/remotesapi/v1alpha1/chunkstore.proto b/proto/dolt/services/remotesapi/v1alpha1/chunkstore.proto index ebb8c17a9c..9a80552973 100644 --- a/proto/dolt/services/remotesapi/v1alpha1/chunkstore.proto +++ b/proto/dolt/services/remotesapi/v1alpha1/chunkstore.proto @@ -16,7 +16,7 @@ syntax = "proto3"; package dolt.services.remotesapi.v1alpha1; -option go_package = "github.com/liquidata-inc/dolt/go/gen/proto/dolt/services/remotesapi/v1alpha1;remotesapi"; +option go_package = "github.com/dolthub/dolt/go/gen/proto/dolt/services/remotesapi/v1alpha1;remotesapi"; service ChunkStoreService { rpc GetRepoMetadata(GetRepoMetadataRequest) returns (GetRepoMetadataResponse); diff --git a/proto/dolt/services/remotesapi/v1alpha1/credentials.proto b/proto/dolt/services/remotesapi/v1alpha1/credentials.proto index ebad259244..4856ec609b 100644 --- a/proto/dolt/services/remotesapi/v1alpha1/credentials.proto +++ b/proto/dolt/services/remotesapi/v1alpha1/credentials.proto @@ -16,7 +16,7 @@ syntax = "proto3"; package dolt.services.remotesapi.v1alpha1; -option go_package = "github.com/liquidata-inc/dolt/go/gen/proto/dolt/services/remotesapi/v1alpha1;remotesapi"; +option go_package = "github.com/dolthub/dolt/go/gen/proto/dolt/services/remotesapi/v1alpha1;remotesapi"; service CredentialsService { rpc WhoAmI(WhoAmIRequest) returns (WhoAmIResponse);