diff --git a/go/cmd/dim/data_window.go b/go/cmd/dim/data_window.go index b74567896e..dc28b3c1b4 100644 --- a/go/cmd/dim/data_window.go +++ b/go/cmd/dim/data_window.go @@ -19,9 +19,9 @@ import ( "log" "runtime/debug" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/rowconv" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/rowconv" + "github.com/liquidata-inc/dolt/go/store/types" ) type DataWindow struct { diff --git a/go/cmd/dim/dim.go b/go/cmd/dim/dim.go index 93e561c947..1f00a1054d 100644 --- a/go/cmd/dim/dim.go +++ b/go/cmd/dim/dim.go @@ -21,9 +21,9 @@ import ( "github.com/gizak/termui/v3" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/rowconv" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/rowconv" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" + "github.com/liquidata-inc/dolt/go/store/types" ) func uiWinHeightToRowCount(height int) int { diff --git a/go/cmd/dim/dim_row.go b/go/cmd/dim/dim_row.go index 24183866f7..674e2cf5f4 100644 --- a/go/cmd/dim/dim_row.go +++ b/go/cmd/dim/dim_row.go @@ -18,11 +18,11 @@ import ( "context" "log" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/rowconv" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/valutil" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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/utils/valutil" + "github.com/liquidata-inc/dolt/go/store/types" ) type DimRow struct { diff --git a/go/cmd/dim/main.go b/go/cmd/dim/main.go index 78775ec571..9debd7d8b6 100644 --- a/go/cmd/dim/main.go +++ b/go/cmd/dim/main.go @@ -24,10 +24,10 @@ import ( "os" "runtime/debug" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/iohelp" + "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/iohelp" ) const ( diff --git a/go/cmd/dim/renderer.go b/go/cmd/dim/renderer.go index b6891c31c6..12e27cf0da 100644 --- a/go/cmd/dim/renderer.go +++ b/go/cmd/dim/renderer.go @@ -18,9 +18,9 @@ import ( "github.com/gizak/termui/v3" "github.com/gizak/termui/v3/widgets" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) type TableRenderer struct { diff --git a/go/cmd/dim/row_editor.go b/go/cmd/dim/row_editor.go index 72062a418e..439cba2a15 100644 --- a/go/cmd/dim/row_editor.go +++ b/go/cmd/dim/row_editor.go @@ -20,8 +20,8 @@ import ( "github.com/gizak/termui/v3" "github.com/nsf/termbox-go" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" + "github.com/liquidata-inc/dolt/go/store/types" ) const ( diff --git a/go/cmd/dolt/cli/arg_helpers.go b/go/cmd/dolt/cli/arg_helpers.go index dbbf0b41b5..e1e38f5465 100644 --- a/go/cmd/dolt/cli/arg_helpers.go +++ b/go/cmd/dolt/cli/arg_helpers.go @@ -20,11 +20,11 @@ import ( "os" "strings" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/argparser" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/libraries/doltcore" + "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/argparser" + "github.com/liquidata-inc/dolt/go/store/types" ) var ErrEmptyDefTuple = errors.New("empty definition tuple") diff --git a/go/cmd/dolt/cli/arg_helpers_test.go b/go/cmd/dolt/cli/arg_helpers_test.go index 89a5692a36..dca6de069d 100644 --- a/go/cmd/dolt/cli/arg_helpers_test.go +++ b/go/cmd/dolt/cli/arg_helpers_test.go @@ -18,9 +18,9 @@ import ( "context" "testing" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) func TestParseKeyValues(t *testing.T) { diff --git a/go/cmd/dolt/cli/command.go b/go/cmd/dolt/cli/command.go index e6b19da203..e58f9c38ba 100644 --- a/go/cmd/dolt/cli/command.go +++ b/go/cmd/dolt/cli/command.go @@ -19,7 +19,7 @@ import ( "github.com/fatih/color" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/env" ) // CommandFunc specifies the signature of the functions that will be called based on the command line being executed. diff --git a/go/cmd/dolt/cli/command_test.go b/go/cmd/dolt/cli/command_test.go index 7c84252a41..88223b95c7 100644 --- a/go/cmd/dolt/cli/command_test.go +++ b/go/cmd/dolt/cli/command_test.go @@ -19,7 +19,7 @@ import ( "strings" "testing" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/env" ) const ( diff --git a/go/cmd/dolt/cli/help.go b/go/cmd/dolt/cli/help.go index a9c449f173..6e6e60ece9 100644 --- a/go/cmd/dolt/cli/help.go +++ b/go/cmd/dolt/cli/help.go @@ -23,8 +23,8 @@ import ( "github.com/fatih/color" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/argparser" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/funcitr" + "github.com/liquidata-inc/dolt/go/libraries/utils/argparser" + "github.com/liquidata-inc/dolt/go/libraries/utils/funcitr" ) var underline = color.New(color.Underline) diff --git a/go/cmd/dolt/commands/add.go b/go/cmd/dolt/commands/add.go index 32410dd7d7..95f17795fb 100644 --- a/go/cmd/dolt/commands/add.go +++ b/go/cmd/dolt/commands/add.go @@ -17,11 +17,11 @@ package commands import ( "context" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/cli" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/errhand" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env/actions" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/argparser" + "github.com/liquidata-inc/dolt/go/cmd/dolt/cli" + "github.com/liquidata-inc/dolt/go/cmd/dolt/errhand" + "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/utils/argparser" ) const allParam = "all" diff --git a/go/cmd/dolt/commands/branch.go b/go/cmd/dolt/commands/branch.go index cd5f7c938b..55bddfd6fb 100644 --- a/go/cmd/dolt/commands/branch.go +++ b/go/cmd/dolt/commands/branch.go @@ -22,14 +22,14 @@ import ( "github.com/fatih/color" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/cli" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/errhand" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env/actions" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/ref" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/argparser" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/set" + "github.com/liquidata-inc/dolt/go/cmd/dolt/cli" + "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/ref" + "github.com/liquidata-inc/dolt/go/libraries/utils/argparser" + "github.com/liquidata-inc/dolt/go/libraries/utils/set" ) var branchShortDesc = `List, create, or delete branches` diff --git a/go/cmd/dolt/commands/checkout.go b/go/cmd/dolt/commands/checkout.go index 3dfed53cdd..2f29f31af3 100644 --- a/go/cmd/dolt/commands/checkout.go +++ b/go/cmd/dolt/commands/checkout.go @@ -17,12 +17,12 @@ package commands import ( "context" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/cli" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/errhand" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env/actions" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/argparser" + "github.com/liquidata-inc/dolt/go/cmd/dolt/cli" + "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/utils/argparser" ) var coShortDesc = `Switch branches or restore working tree tables` diff --git a/go/cmd/dolt/commands/clone.go b/go/cmd/dolt/commands/clone.go index 39cff391b4..2ef4c4f39a 100644 --- a/go/cmd/dolt/commands/clone.go +++ b/go/cmd/dolt/commands/clone.go @@ -20,20 +20,20 @@ import ( "path" "path/filepath" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/cli" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/errhand" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/dbfactory" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env/actions" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/ref" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/remotestorage" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/argparser" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/earl" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/ld/dolt/go/store/datas" - "github.com/liquidata-inc/ld/dolt/go/store/hash" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/cmd/dolt/cli" + "github.com/liquidata-inc/dolt/go/cmd/dolt/errhand" + "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/doltcore/env/actions" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/ref" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/remotestorage" + "github.com/liquidata-inc/dolt/go/libraries/utils/argparser" + "github.com/liquidata-inc/dolt/go/libraries/utils/earl" + "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" ) const ( diff --git a/go/cmd/dolt/commands/cnfcmds/cat.go b/go/cmd/dolt/commands/cnfcmds/cat.go index 2b32cac625..0c3c281466 100644 --- a/go/cmd/dolt/commands/cnfcmds/cat.go +++ b/go/cmd/dolt/commands/cnfcmds/cat.go @@ -17,21 +17,21 @@ package cnfcmds import ( "context" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/cli" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/commands" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/errhand" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env/actions" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/merge" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/pipeline" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/untyped" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/untyped/fwt" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/untyped/nullprinter" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/argparser" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/iohelp" + "github.com/liquidata-inc/dolt/go/cmd/dolt/cli" + "github.com/liquidata-inc/dolt/go/cmd/dolt/commands" + "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" + "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/fwt" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/untyped/nullprinter" + "github.com/liquidata-inc/dolt/go/libraries/utils/argparser" + "github.com/liquidata-inc/dolt/go/libraries/utils/iohelp" ) var catShortDesc = "print conflicts" diff --git a/go/cmd/dolt/commands/cnfcmds/conflicts.go b/go/cmd/dolt/commands/cnfcmds/conflicts.go index 8b724ad485..40e37670ab 100644 --- a/go/cmd/dolt/commands/cnfcmds/conflicts.go +++ b/go/cmd/dolt/commands/cnfcmds/conflicts.go @@ -15,7 +15,7 @@ package cnfcmds import ( - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/cli" + "github.com/liquidata-inc/dolt/go/cmd/dolt/cli" ) var Commands = cli.GenSubCommandHandler([]*cli.Command{ diff --git a/go/cmd/dolt/commands/cnfcmds/resolve.go b/go/cmd/dolt/commands/cnfcmds/resolve.go index 3068f9c7c3..5d7d20d722 100644 --- a/go/cmd/dolt/commands/cnfcmds/resolve.go +++ b/go/cmd/dolt/commands/cnfcmds/resolve.go @@ -17,14 +17,14 @@ package cnfcmds import ( "context" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/cli" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/commands" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/errhand" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env/actions" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/merge" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/argparser" + "github.com/liquidata-inc/dolt/go/cmd/dolt/cli" + "github.com/liquidata-inc/dolt/go/cmd/dolt/commands" + "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" + "github.com/liquidata-inc/dolt/go/libraries/utils/argparser" ) var resShortDesc = "Removes rows from list of conflicts" diff --git a/go/cmd/dolt/commands/commands_test.go b/go/cmd/dolt/commands/commands_test.go index ddbb844436..cee5dccd37 100644 --- a/go/cmd/dolt/commands/commands_test.go +++ b/go/cmd/dolt/commands/commands_test.go @@ -19,11 +19,11 @@ import ( "path/filepath" "testing" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/cli" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/dbfactory" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/filesys" + "github.com/liquidata-inc/dolt/go/cmd/dolt/cli" + "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" ) const ( diff --git a/go/cmd/dolt/commands/commit.go b/go/cmd/dolt/commands/commit.go index a1ef01c622..4a1dfa2e5f 100644 --- a/go/cmd/dolt/commands/commit.go +++ b/go/cmd/dolt/commands/commit.go @@ -22,12 +22,12 @@ import ( "github.com/fatih/color" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/cli" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/errhand" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env/actions" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/argparser" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/editor" + "github.com/liquidata-inc/dolt/go/cmd/dolt/cli" + "github.com/liquidata-inc/dolt/go/cmd/dolt/errhand" + "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/utils/argparser" + "github.com/liquidata-inc/dolt/go/libraries/utils/editor" ) var commitShortDesc = `Record changes to the repository` diff --git a/go/cmd/dolt/commands/config.go b/go/cmd/dolt/commands/config.go index 9994c79eef..20438aed34 100644 --- a/go/cmd/dolt/commands/config.go +++ b/go/cmd/dolt/commands/config.go @@ -19,11 +19,11 @@ import ( "github.com/fatih/color" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/cli" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/argparser" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/config" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/set" + "github.com/liquidata-inc/dolt/go/cmd/dolt/cli" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/env" + "github.com/liquidata-inc/dolt/go/libraries/utils/argparser" + "github.com/liquidata-inc/dolt/go/libraries/utils/config" + "github.com/liquidata-inc/dolt/go/libraries/utils/set" ) const ( diff --git a/go/cmd/dolt/commands/config_test.go b/go/cmd/dolt/commands/config_test.go index 3c895fe452..45e4c71220 100644 --- a/go/cmd/dolt/commands/config_test.go +++ b/go/cmd/dolt/commands/config_test.go @@ -18,9 +18,9 @@ import ( "reflect" "testing" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/config" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/set" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/env" + "github.com/liquidata-inc/dolt/go/libraries/utils/config" + "github.com/liquidata-inc/dolt/go/libraries/utils/set" ) var globalCfg = set.NewStrSet([]string{globalParamName}) diff --git a/go/cmd/dolt/commands/credcmds/creds.go b/go/cmd/dolt/commands/credcmds/creds.go index 0c2e6930b2..7ad0ea9b67 100644 --- a/go/cmd/dolt/commands/credcmds/creds.go +++ b/go/cmd/dolt/commands/credcmds/creds.go @@ -15,7 +15,7 @@ package credcmds import ( - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/cli" + "github.com/liquidata-inc/dolt/go/cmd/dolt/cli" ) var Commands = cli.GenSubCommandHandler([]*cli.Command{ diff --git a/go/cmd/dolt/commands/credcmds/ls.go b/go/cmd/dolt/commands/credcmds/ls.go index 08f2ca008f..478db92d9b 100644 --- a/go/cmd/dolt/commands/credcmds/ls.go +++ b/go/cmd/dolt/commands/credcmds/ls.go @@ -19,12 +19,12 @@ import ( "github.com/fatih/color" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/cli" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/commands" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/creds" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env/actions" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/argparser" + "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/creds" + "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/utils/argparser" ) var lsShortDesc = "" diff --git a/go/cmd/dolt/commands/credcmds/new.go b/go/cmd/dolt/commands/credcmds/new.go index ddcd14a804..aa30f29941 100644 --- a/go/cmd/dolt/commands/credcmds/new.go +++ b/go/cmd/dolt/commands/credcmds/new.go @@ -15,11 +15,11 @@ package credcmds import ( - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/cli" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/commands" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env/actions" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/argparser" + "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/env" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/env/actions" + "github.com/liquidata-inc/dolt/go/libraries/utils/argparser" ) var newShortDesc = "" diff --git a/go/cmd/dolt/commands/credcmds/rm.go b/go/cmd/dolt/commands/credcmds/rm.go index 43604e1142..08e6eb5508 100644 --- a/go/cmd/dolt/commands/credcmds/rm.go +++ b/go/cmd/dolt/commands/credcmds/rm.go @@ -17,11 +17,11 @@ package credcmds import ( "github.com/fatih/color" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/cli" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/commands" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env/actions" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/argparser" + "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/env" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/env/actions" + "github.com/liquidata-inc/dolt/go/libraries/utils/argparser" ) var rmShortDesc = "" diff --git a/go/cmd/dolt/commands/diff.go b/go/cmd/dolt/commands/diff.go index f8877e98e7..9a6129a7ff 100644 --- a/go/cmd/dolt/commands/diff.go +++ b/go/cmd/dolt/commands/diff.go @@ -22,24 +22,24 @@ import ( "github.com/fatih/color" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/cli" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/errhand" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/diff" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env/actions" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/rowconv" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/sql" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/pipeline" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/untyped" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/untyped/fwt" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/untyped/nullprinter" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/argparser" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/iohelp" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/mathutil" - "github.com/liquidata-inc/ld/dolt/go/store/hash" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/cmd/dolt/cli" + "github.com/liquidata-inc/dolt/go/cmd/dolt/errhand" + "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/env/actions" + "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/sql" + "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/fwt" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/untyped/nullprinter" + "github.com/liquidata-inc/dolt/go/libraries/utils/argparser" + "github.com/liquidata-inc/dolt/go/libraries/utils/iohelp" + "github.com/liquidata-inc/dolt/go/libraries/utils/mathutil" + "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/liquidata-inc/dolt/go/store/types" ) const ( diff --git a/go/cmd/dolt/commands/fetch.go b/go/cmd/dolt/commands/fetch.go index 3af272043c..cb71eec8f6 100644 --- a/go/cmd/dolt/commands/fetch.go +++ b/go/cmd/dolt/commands/fetch.go @@ -17,14 +17,14 @@ package commands import ( "context" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/cli" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/errhand" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env/actions" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/ref" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/argparser" - "github.com/liquidata-inc/ld/dolt/go/store/datas" + "github.com/liquidata-inc/dolt/go/cmd/dolt/cli" + "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/ref" + "github.com/liquidata-inc/dolt/go/libraries/utils/argparser" + "github.com/liquidata-inc/dolt/go/store/datas" ) var fetchShortDesc = "Download objects and refs from another repository" diff --git a/go/cmd/dolt/commands/init.go b/go/cmd/dolt/commands/init.go index f0d0f155ad..f54fb951cf 100644 --- a/go/cmd/dolt/commands/init.go +++ b/go/cmd/dolt/commands/init.go @@ -19,12 +19,12 @@ import ( "github.com/fatih/color" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/cli" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/errhand" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/argparser" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/cmd/dolt/cli" + "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/utils/argparser" + "github.com/liquidata-inc/dolt/go/store/types" ) const ( diff --git a/go/cmd/dolt/commands/init_test.go b/go/cmd/dolt/commands/init_test.go index fbd0ee0aaf..b7a767a6b0 100644 --- a/go/cmd/dolt/commands/init_test.go +++ b/go/cmd/dolt/commands/init_test.go @@ -17,7 +17,7 @@ package commands import ( "testing" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/env" ) func TestInit(t *testing.T) { diff --git a/go/cmd/dolt/commands/log.go b/go/cmd/dolt/commands/log.go index f3070b2bab..320c8dfbd8 100644 --- a/go/cmd/dolt/commands/log.go +++ b/go/cmd/dolt/commands/log.go @@ -17,12 +17,12 @@ package commands import ( "github.com/fatih/color" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/cli" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env/actions" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/argparser" - "github.com/liquidata-inc/ld/dolt/go/store/hash" + "github.com/liquidata-inc/dolt/go/cmd/dolt/cli" + "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/utils/argparser" + "github.com/liquidata-inc/dolt/go/store/hash" "context" "strings" diff --git a/go/cmd/dolt/commands/log_test.go b/go/cmd/dolt/commands/log_test.go index b50a7fff1d..0c8ca68ff6 100644 --- a/go/cmd/dolt/commands/log_test.go +++ b/go/cmd/dolt/commands/log_test.go @@ -18,9 +18,9 @@ import ( "context" "testing" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/cli" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/cmd/dolt/cli" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" + "github.com/liquidata-inc/dolt/go/store/types" ) func TestLog(t *testing.T) { diff --git a/go/cmd/dolt/commands/login.go b/go/cmd/dolt/commands/login.go index 3d72693bee..826692d929 100644 --- a/go/cmd/dolt/commands/login.go +++ b/go/cmd/dolt/commands/login.go @@ -21,13 +21,13 @@ import ( "github.com/skratchdot/open-golang/open" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/cli" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/errhand" - remotesapi "github.com/liquidata-inc/ld/dolt/go/gen/proto/dolt/services/remotesapi_v1alpha1" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/creds" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env/actions" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/argparser" + "github.com/liquidata-inc/dolt/go/cmd/dolt/cli" + "github.com/liquidata-inc/dolt/go/cmd/dolt/errhand" + remotesapi "github.com/liquidata-inc/dolt/go/gen/proto/dolt/services/remotesapi_v1alpha1" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/creds" + "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/utils/argparser" ) const ( diff --git a/go/cmd/dolt/commands/ls.go b/go/cmd/dolt/commands/ls.go index 0b9ae167da..f07fd4a988 100644 --- a/go/cmd/dolt/commands/ls.go +++ b/go/cmd/dolt/commands/ls.go @@ -18,11 +18,11 @@ import ( "context" "sort" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/cli" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/errhand" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/argparser" + "github.com/liquidata-inc/dolt/go/cmd/dolt/cli" + "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/utils/argparser" ) var lsShortDesc = "List tables" diff --git a/go/cmd/dolt/commands/merge.go b/go/cmd/dolt/commands/merge.go index 7ef1b65021..ab02f49fed 100644 --- a/go/cmd/dolt/commands/merge.go +++ b/go/cmd/dolt/commands/merge.go @@ -22,14 +22,14 @@ import ( "github.com/fatih/color" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/cli" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/errhand" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env/actions" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/merge" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/ref" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/argparser" + "github.com/liquidata-inc/dolt/go/cmd/dolt/cli" + "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" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/ref" + "github.com/liquidata-inc/dolt/go/libraries/utils/argparser" ) const ( diff --git a/go/cmd/dolt/commands/pull.go b/go/cmd/dolt/commands/pull.go index a769dded7e..d8fab98ebc 100644 --- a/go/cmd/dolt/commands/pull.go +++ b/go/cmd/dolt/commands/pull.go @@ -17,11 +17,11 @@ package commands import ( "context" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/cli" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/errhand" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/ref" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/argparser" + "github.com/liquidata-inc/dolt/go/cmd/dolt/cli" + "github.com/liquidata-inc/dolt/go/cmd/dolt/errhand" + "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/argparser" ) var pullShortDesc = "Fetch from and integrate with another repository or a local branch" diff --git a/go/cmd/dolt/commands/push.go b/go/cmd/dolt/commands/push.go index 3e3ea80eb1..5ad2405163 100644 --- a/go/cmd/dolt/commands/push.go +++ b/go/cmd/dolt/commands/push.go @@ -21,16 +21,16 @@ import ( "github.com/dustin/go-humanize" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/cli" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/errhand" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env/actions" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/ref" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/remotestorage" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/argparser" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/earl" - "github.com/liquidata-inc/ld/dolt/go/store/datas" + "github.com/liquidata-inc/dolt/go/cmd/dolt/cli" + "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/ref" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/remotestorage" + "github.com/liquidata-inc/dolt/go/libraries/utils/argparser" + "github.com/liquidata-inc/dolt/go/libraries/utils/earl" + "github.com/liquidata-inc/dolt/go/store/datas" ) const ( diff --git a/go/cmd/dolt/commands/remote.go b/go/cmd/dolt/commands/remote.go index 8c9d5dd041..9520a8d0bc 100644 --- a/go/cmd/dolt/commands/remote.go +++ b/go/cmd/dolt/commands/remote.go @@ -23,16 +23,16 @@ import ( "path/filepath" "strings" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/dbfactory" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/ref" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/filesys" + "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/utils/filesys" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/cli" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/errhand" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/argparser" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/config" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/earl" + "github.com/liquidata-inc/dolt/go/cmd/dolt/cli" + "github.com/liquidata-inc/dolt/go/cmd/dolt/errhand" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/env" + "github.com/liquidata-inc/dolt/go/libraries/utils/argparser" + "github.com/liquidata-inc/dolt/go/libraries/utils/config" + "github.com/liquidata-inc/dolt/go/libraries/utils/earl" ) var ErrInvalidPort = errors.New("invalid port") diff --git a/go/cmd/dolt/commands/remote_test.go b/go/cmd/dolt/commands/remote_test.go index 0b12eafd37..9d976dd7b5 100644 --- a/go/cmd/dolt/commands/remote_test.go +++ b/go/cmd/dolt/commands/remote_test.go @@ -21,10 +21,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/config" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/osutil" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/env" + "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/osutil" ) func TestGetAbsRemoteUrl(t *testing.T) { diff --git a/go/cmd/dolt/commands/reset.go b/go/cmd/dolt/commands/reset.go index 1c440a1da3..591978b100 100644 --- a/go/cmd/dolt/commands/reset.go +++ b/go/cmd/dolt/commands/reset.go @@ -19,12 +19,12 @@ import ( "fmt" "strings" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/cli" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/errhand" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env/actions" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/argparser" + "github.com/liquidata-inc/dolt/go/cmd/dolt/cli" + "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/utils/argparser" ) const ( diff --git a/go/cmd/dolt/commands/schema.go b/go/cmd/dolt/commands/schema.go index cd40a2ffc6..18565c3634 100644 --- a/go/cmd/dolt/commands/schema.go +++ b/go/cmd/dolt/commands/schema.go @@ -20,17 +20,17 @@ import ( "github.com/fatih/color" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/cli" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/errhand" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema/alterschema" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema/encoding" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/sql" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/argparser" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/cmd/dolt/cli" + "github.com/liquidata-inc/dolt/go/cmd/dolt/errhand" + "github.com/liquidata-inc/dolt/go/libraries/doltcore" + "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/libraries/doltcore/schema/alterschema" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema/encoding" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/sql" + "github.com/liquidata-inc/dolt/go/libraries/utils/argparser" + "github.com/liquidata-inc/dolt/go/store/types" ) const ( diff --git a/go/cmd/dolt/commands/sql.go b/go/cmd/dolt/commands/sql.go index 2a0055fdc3..68aed1aa23 100644 --- a/go/cmd/dolt/commands/sql.go +++ b/go/cmd/dolt/commands/sql.go @@ -31,22 +31,22 @@ import ( "github.com/src-d/go-mysql-server/sql" "vitess.io/vitess/go/vt/sqlparser" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/cli" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/errhand" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - dsql "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/sql" - dsqle "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/sqle" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/pipeline" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/untyped" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/untyped/fwt" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/untyped/nullprinter" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/untyped/tabular" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/argparser" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/iohelp" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/cmd/dolt/cli" + "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/schema" + dsql "github.com/liquidata-inc/dolt/go/libraries/doltcore/sql" + dsqle "github.com/liquidata-inc/dolt/go/libraries/doltcore/sqle" + "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/fwt" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/untyped/nullprinter" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/untyped/tabular" + "github.com/liquidata-inc/dolt/go/libraries/utils/argparser" + "github.com/liquidata-inc/dolt/go/libraries/utils/iohelp" + "github.com/liquidata-inc/dolt/go/store/types" ) // An environment variable to set to get indexed join behavior, currently experimental diff --git a/go/cmd/dolt/commands/sql_test.go b/go/cmd/dolt/commands/sql_test.go index 907f69724e..366d6bc17b 100644 --- a/go/cmd/dolt/commands/sql_test.go +++ b/go/cmd/dolt/commands/sql_test.go @@ -21,12 +21,12 @@ import ( "github.com/google/uuid" "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/dtestutils" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/typed/noms" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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/table" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/typed/noms" + "github.com/liquidata-inc/dolt/go/store/types" ) //var UUIDS = []uuid.UUID{ diff --git a/go/cmd/dolt/commands/sqlserver/server.go b/go/cmd/dolt/commands/sqlserver/server.go index cdb39a2acb..84be119b34 100644 --- a/go/cmd/dolt/commands/sqlserver/server.go +++ b/go/cmd/dolt/commands/sqlserver/server.go @@ -26,9 +26,9 @@ import ( "github.com/src-d/go-mysql-server/sql" "vitess.io/vitess/go/mysql" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/cli" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/doltdb" - dsqle "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/sqle" + "github.com/liquidata-inc/dolt/go/cmd/dolt/cli" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" + dsqle "github.com/liquidata-inc/dolt/go/libraries/doltcore/sqle" ) // serve starts a MySQL-compatible server. Returns any errors that were encountered. diff --git a/go/cmd/dolt/commands/sqlserver/server_test.go b/go/cmd/dolt/commands/sqlserver/server_test.go index 70a2959fd3..57b778f566 100644 --- a/go/cmd/dolt/commands/sqlserver/server_test.go +++ b/go/cmd/dolt/commands/sqlserver/server_test.go @@ -24,11 +24,11 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/net/context" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/commands" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/dtestutils" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/typed/noms" + "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/table" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/typed/noms" ) type testPerson struct { diff --git a/go/cmd/dolt/commands/sqlserver/sqlserver.go b/go/cmd/dolt/commands/sqlserver/sqlserver.go index e8d71fc7cf..8431bedf0d 100644 --- a/go/cmd/dolt/commands/sqlserver/sqlserver.go +++ b/go/cmd/dolt/commands/sqlserver/sqlserver.go @@ -17,10 +17,10 @@ package sqlserver import ( "fmt" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/cli" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/commands" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/argparser" + "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/env" + "github.com/liquidata-inc/dolt/go/libraries/utils/argparser" ) const ( diff --git a/go/cmd/dolt/commands/status.go b/go/cmd/dolt/commands/status.go index 9d19414c93..d59d436c62 100644 --- a/go/cmd/dolt/commands/status.go +++ b/go/cmd/dolt/commands/status.go @@ -22,12 +22,12 @@ import ( "github.com/fatih/color" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/cli" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env/actions" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/argparser" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/iohelp" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/set" + "github.com/liquidata-inc/dolt/go/cmd/dolt/cli" + "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/utils/argparser" + "github.com/liquidata-inc/dolt/go/libraries/utils/iohelp" + "github.com/liquidata-inc/dolt/go/libraries/utils/set" ) var statusShortDesc = "Show the working status" diff --git a/go/cmd/dolt/commands/tblcmds/cp.go b/go/cmd/dolt/commands/tblcmds/cp.go index 4adea1277f..ac046099cc 100644 --- a/go/cmd/dolt/commands/tblcmds/cp.go +++ b/go/cmd/dolt/commands/tblcmds/cp.go @@ -17,12 +17,12 @@ package tblcmds import ( "context" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/cli" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/commands" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/errhand" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/argparser" + "github.com/liquidata-inc/dolt/go/cmd/dolt/cli" + "github.com/liquidata-inc/dolt/go/cmd/dolt/commands" + "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/utils/argparser" ) var tblCpShortDesc = "Makes a copy of a table" diff --git a/go/cmd/dolt/commands/tblcmds/create.go b/go/cmd/dolt/commands/tblcmds/create.go index f4ec83cdb3..8dc2e4cc84 100644 --- a/go/cmd/dolt/commands/tblcmds/create.go +++ b/go/cmd/dolt/commands/tblcmds/create.go @@ -19,14 +19,14 @@ import ( "io/ioutil" "os" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/cli" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/commands" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/errhand" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema/encoding" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/argparser" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/cmd/dolt/cli" + "github.com/liquidata-inc/dolt/go/cmd/dolt/commands" + "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/schema/encoding" + "github.com/liquidata-inc/dolt/go/libraries/utils/argparser" + "github.com/liquidata-inc/dolt/go/store/types" ) var tblCreateShortDesc = "Creates or overwrite existing table(s) with an empty table(s)." diff --git a/go/cmd/dolt/commands/tblcmds/export.go b/go/cmd/dolt/commands/tblcmds/export.go index 49cf1b0a4e..e05f388ce5 100644 --- a/go/cmd/dolt/commands/tblcmds/export.go +++ b/go/cmd/dolt/commands/tblcmds/export.go @@ -17,11 +17,11 @@ package tblcmds import ( "github.com/fatih/color" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/cli" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/mvdata" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/argparser" + "github.com/liquidata-inc/dolt/go/cmd/dolt/cli" + "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/mvdata" + "github.com/liquidata-inc/dolt/go/libraries/utils/argparser" ) var exportShortDesc = `Export the contents of a table to a file.` diff --git a/go/cmd/dolt/commands/tblcmds/import.go b/go/cmd/dolt/commands/tblcmds/import.go index 45a99ba9a4..e9c6143188 100644 --- a/go/cmd/dolt/commands/tblcmds/import.go +++ b/go/cmd/dolt/commands/tblcmds/import.go @@ -20,16 +20,16 @@ import ( "github.com/fatih/color" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/cli" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/errhand" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/mvdata" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/pipeline" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/typed/noms" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/argparser" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/cmd/dolt/cli" + "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/mvdata" + "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/libraries/doltcore/table/typed/noms" + "github.com/liquidata-inc/dolt/go/libraries/utils/argparser" + "github.com/liquidata-inc/dolt/go/store/types" ) const ( diff --git a/go/cmd/dolt/commands/tblcmds/mv.go b/go/cmd/dolt/commands/tblcmds/mv.go index ef5b60eb7f..256364ef78 100644 --- a/go/cmd/dolt/commands/tblcmds/mv.go +++ b/go/cmd/dolt/commands/tblcmds/mv.go @@ -17,11 +17,11 @@ package tblcmds import ( "context" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/cli" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/commands" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/errhand" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/argparser" + "github.com/liquidata-inc/dolt/go/cmd/dolt/cli" + "github.com/liquidata-inc/dolt/go/cmd/dolt/commands" + "github.com/liquidata-inc/dolt/go/cmd/dolt/errhand" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/env" + "github.com/liquidata-inc/dolt/go/libraries/utils/argparser" ) var tblMvShortDesc = "Renames a table" diff --git a/go/cmd/dolt/commands/tblcmds/putrow.go b/go/cmd/dolt/commands/tblcmds/putrow.go index 3896da51e5..765a682eed 100644 --- a/go/cmd/dolt/commands/tblcmds/putrow.go +++ b/go/cmd/dolt/commands/tblcmds/putrow.go @@ -20,16 +20,16 @@ import ( "github.com/fatih/color" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/cli" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/commands" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/errhand" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/rowconv" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/untyped" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/argparser" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/cmd/dolt/cli" + "github.com/liquidata-inc/dolt/go/cmd/dolt/commands" + "github.com/liquidata-inc/dolt/go/cmd/dolt/errhand" + "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/untyped" + "github.com/liquidata-inc/dolt/go/libraries/utils/argparser" + "github.com/liquidata-inc/dolt/go/store/types" ) var putRowShortDesc = "Adds or updates a row in a table" diff --git a/go/cmd/dolt/commands/tblcmds/putrow_test.go b/go/cmd/dolt/commands/tblcmds/putrow_test.go index a871dcbd71..aa9832bd07 100644 --- a/go/cmd/dolt/commands/tblcmds/putrow_test.go +++ b/go/cmd/dolt/commands/tblcmds/putrow_test.go @@ -21,12 +21,12 @@ import ( "github.com/google/uuid" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/dtestutils" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/typed/noms" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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/table" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/typed/noms" + "github.com/liquidata-inc/dolt/go/store/types" ) var expectedId = types.UUID(uuid.Must(uuid.Parse("11111111-1111-1111-1111-111111111111"))) diff --git a/go/cmd/dolt/commands/tblcmds/rm.go b/go/cmd/dolt/commands/tblcmds/rm.go index d9546df03e..e87f022e25 100644 --- a/go/cmd/dolt/commands/tblcmds/rm.go +++ b/go/cmd/dolt/commands/tblcmds/rm.go @@ -17,12 +17,12 @@ package tblcmds import ( "context" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/cli" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/commands" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/errhand" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/argparser" + "github.com/liquidata-inc/dolt/go/cmd/dolt/cli" + "github.com/liquidata-inc/dolt/go/cmd/dolt/commands" + "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/utils/argparser" ) var tblRmShortDesc = "Removes table(s) from the working set of tables." diff --git a/go/cmd/dolt/commands/tblcmds/rmrow.go b/go/cmd/dolt/commands/tblcmds/rmrow.go index 3512675f02..ad2a66f726 100644 --- a/go/cmd/dolt/commands/tblcmds/rmrow.go +++ b/go/cmd/dolt/commands/tblcmds/rmrow.go @@ -19,13 +19,13 @@ import ( "github.com/fatih/color" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/cli" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/commands" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/errhand" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/argparser" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/cmd/dolt/cli" + "github.com/liquidata-inc/dolt/go/cmd/dolt/commands" + "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/utils/argparser" + "github.com/liquidata-inc/dolt/go/store/types" ) var rmRowShortDesc = "Removes row(s) from a table" diff --git a/go/cmd/dolt/commands/tblcmds/select.go b/go/cmd/dolt/commands/tblcmds/select.go index caf9046eab..f1a50c6bce 100644 --- a/go/cmd/dolt/commands/tblcmds/select.go +++ b/go/cmd/dolt/commands/tblcmds/select.go @@ -21,25 +21,25 @@ import ( "github.com/fatih/color" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/cli" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/commands" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/errhand" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/rowconv" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/pipeline" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/typed" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/typed/noms" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/untyped" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/untyped/fwt" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/untyped/nullprinter" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/untyped/tabular" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/argparser" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/iohelp" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/cmd/dolt/cli" + "github.com/liquidata-inc/dolt/go/cmd/dolt/commands" + "github.com/liquidata-inc/dolt/go/cmd/dolt/errhand" + "github.com/liquidata-inc/dolt/go/libraries/doltcore" + "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/pipeline" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/typed" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/typed/noms" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/untyped" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/untyped/fwt" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/untyped/nullprinter" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/untyped/tabular" + "github.com/liquidata-inc/dolt/go/libraries/utils/argparser" + "github.com/liquidata-inc/dolt/go/libraries/utils/iohelp" + "github.com/liquidata-inc/dolt/go/store/types" ) const ( diff --git a/go/cmd/dolt/commands/tblcmds/table.go b/go/cmd/dolt/commands/tblcmds/table.go index 9df3227465..6cad2c6538 100644 --- a/go/cmd/dolt/commands/tblcmds/table.go +++ b/go/cmd/dolt/commands/tblcmds/table.go @@ -14,7 +14,7 @@ package tblcmds -import "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/cli" +import "github.com/liquidata-inc/dolt/go/cmd/dolt/cli" var Commands = cli.GenSubCommandHandler([]*cli.Command{ {Name: "import", Desc: "Creates, overwrites, or updates a table from the data in a file.", Func: Import, ReqRepo: true}, diff --git a/go/cmd/dolt/commands/utils.go b/go/cmd/dolt/commands/utils.go index 1d4c53a4f4..16d3f25d86 100644 --- a/go/cmd/dolt/commands/utils.go +++ b/go/cmd/dolt/commands/utils.go @@ -17,10 +17,10 @@ package commands import ( "context" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/errhand" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env/actions" + "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" ) var fwtStageName = "fwt" diff --git a/go/cmd/dolt/commands/version.go b/go/cmd/dolt/commands/version.go index 0ca4abd37b..8dba19bbfb 100644 --- a/go/cmd/dolt/commands/version.go +++ b/go/cmd/dolt/commands/version.go @@ -15,8 +15,8 @@ package commands import ( - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/cli" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env" + "github.com/liquidata-inc/dolt/go/cmd/dolt/cli" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/env" ) // Version displays the version of the running dolt client diff --git a/go/cmd/dolt/dolt.go b/go/cmd/dolt/dolt.go index 4e49f4b30a..41dfc6a952 100644 --- a/go/cmd/dolt/dolt.go +++ b/go/cmd/dolt/dolt.go @@ -23,15 +23,15 @@ import ( "github.com/fatih/color" "github.com/pkg/profile" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/cli" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/commands" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/commands/cnfcmds" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/commands/credcmds" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/commands/sqlserver" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/commands/tblcmds" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/filesys" + "github.com/liquidata-inc/dolt/go/cmd/dolt/cli" + "github.com/liquidata-inc/dolt/go/cmd/dolt/commands" + "github.com/liquidata-inc/dolt/go/cmd/dolt/commands/cnfcmds" + "github.com/liquidata-inc/dolt/go/cmd/dolt/commands/credcmds" + "github.com/liquidata-inc/dolt/go/cmd/dolt/commands/sqlserver" + "github.com/liquidata-inc/dolt/go/cmd/dolt/commands/tblcmds" + "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" ) const ( diff --git a/go/cmd/dolt/fileno_check_darwin.go b/go/cmd/dolt/fileno_check_darwin.go index 243ed29fa6..2ff6074d2e 100644 --- a/go/cmd/dolt/fileno_check_darwin.go +++ b/go/cmd/dolt/fileno_check_darwin.go @@ -20,7 +20,7 @@ import ( "github.com/fatih/color" "golang.org/x/sys/unix" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/cli" + "github.com/liquidata-inc/dolt/go/cmd/dolt/cli" ) var red = color.New(color.FgRed).SprintFunc() diff --git a/go/cmd/git-dolt-smudge/git-dolt-smudge.go b/go/cmd/git-dolt-smudge/git-dolt-smudge.go index 223aaaa75d..2e0e2de740 100644 --- a/go/cmd/git-dolt-smudge/git-dolt-smudge.go +++ b/go/cmd/git-dolt-smudge/git-dolt-smudge.go @@ -21,9 +21,9 @@ import ( "log" "os" - "github.com/liquidata-inc/ld/dolt/go/cmd/git-dolt/config" - "github.com/liquidata-inc/ld/dolt/go/cmd/git-dolt/doltops" - "github.com/liquidata-inc/ld/dolt/go/cmd/git-dolt/utils" + "github.com/liquidata-inc/dolt/go/cmd/git-dolt/config" + "github.com/liquidata-inc/dolt/go/cmd/git-dolt/doltops" + "github.com/liquidata-inc/dolt/go/cmd/git-dolt/utils" ) func main() { diff --git a/go/cmd/git-dolt/commands/fetch.go b/go/cmd/git-dolt/commands/fetch.go index 9682b934e5..9c7577c0a2 100644 --- a/go/cmd/git-dolt/commands/fetch.go +++ b/go/cmd/git-dolt/commands/fetch.go @@ -17,9 +17,9 @@ package commands import ( "fmt" - "github.com/liquidata-inc/ld/dolt/go/cmd/git-dolt/config" - "github.com/liquidata-inc/ld/dolt/go/cmd/git-dolt/doltops" - "github.com/liquidata-inc/ld/dolt/go/cmd/git-dolt/utils" + "github.com/liquidata-inc/dolt/go/cmd/git-dolt/config" + "github.com/liquidata-inc/dolt/go/cmd/git-dolt/doltops" + "github.com/liquidata-inc/dolt/go/cmd/git-dolt/utils" ) // Fetch takes the filename of a git-dolt pointer file and clones diff --git a/go/cmd/git-dolt/commands/install.go b/go/cmd/git-dolt/commands/install.go index 6868b03da3..dffb043d17 100644 --- a/go/cmd/git-dolt/commands/install.go +++ b/go/cmd/git-dolt/commands/install.go @@ -19,7 +19,7 @@ import ( "os/exec" "path/filepath" - "github.com/liquidata-inc/ld/dolt/go/cmd/git-dolt/utils" + "github.com/liquidata-inc/dolt/go/cmd/git-dolt/utils" ) // Install configures this git repository for use with git-dolt; specifically, it sets up the diff --git a/go/cmd/git-dolt/commands/link.go b/go/cmd/git-dolt/commands/link.go index 05d41910da..4f92cbae40 100644 --- a/go/cmd/git-dolt/commands/link.go +++ b/go/cmd/git-dolt/commands/link.go @@ -17,10 +17,10 @@ package commands import ( "fmt" - "github.com/liquidata-inc/ld/dolt/go/cmd/git-dolt/config" - "github.com/liquidata-inc/ld/dolt/go/cmd/git-dolt/doltops" - "github.com/liquidata-inc/ld/dolt/go/cmd/git-dolt/env" - "github.com/liquidata-inc/ld/dolt/go/cmd/git-dolt/utils" + "github.com/liquidata-inc/dolt/go/cmd/git-dolt/config" + "github.com/liquidata-inc/dolt/go/cmd/git-dolt/doltops" + "github.com/liquidata-inc/dolt/go/cmd/git-dolt/env" + "github.com/liquidata-inc/dolt/go/cmd/git-dolt/utils" ) // Link creates a git-dolt pointer file linking the given dolt remote diff --git a/go/cmd/git-dolt/commands/update.go b/go/cmd/git-dolt/commands/update.go index 6ffcbc6697..6506bb2052 100644 --- a/go/cmd/git-dolt/commands/update.go +++ b/go/cmd/git-dolt/commands/update.go @@ -17,8 +17,8 @@ package commands import ( "fmt" - "github.com/liquidata-inc/ld/dolt/go/cmd/git-dolt/config" - "github.com/liquidata-inc/ld/dolt/go/cmd/git-dolt/utils" + "github.com/liquidata-inc/dolt/go/cmd/git-dolt/config" + "github.com/liquidata-inc/dolt/go/cmd/git-dolt/utils" ) // Update updates the git-dolt pointer file at the given filename diff --git a/go/cmd/git-dolt/config/config.go b/go/cmd/git-dolt/config/config.go index 1c1ea34701..e65e712d33 100644 --- a/go/cmd/git-dolt/config/config.go +++ b/go/cmd/git-dolt/config/config.go @@ -21,8 +21,8 @@ import ( "io/ioutil" "strings" - "github.com/liquidata-inc/ld/dolt/go/cmd/git-dolt/env" - "github.com/liquidata-inc/ld/dolt/go/cmd/git-dolt/utils" + "github.com/liquidata-inc/dolt/go/cmd/git-dolt/env" + "github.com/liquidata-inc/dolt/go/cmd/git-dolt/utils" ) // GitDoltConfig represents the configuration for a git-dolt integration. diff --git a/go/cmd/git-dolt/doltops/doltops.go b/go/cmd/git-dolt/doltops/doltops.go index a3d0f63cfc..de2bb806e2 100644 --- a/go/cmd/git-dolt/doltops/doltops.go +++ b/go/cmd/git-dolt/doltops/doltops.go @@ -21,7 +21,7 @@ import ( "fmt" "os/exec" - "github.com/liquidata-inc/ld/dolt/go/cmd/git-dolt/utils" + "github.com/liquidata-inc/dolt/go/cmd/git-dolt/utils" ) // Clone clones the specified dolt remote, streaming the output from dolt clone to stdout. diff --git a/go/cmd/git-dolt/git-dolt.go b/go/cmd/git-dolt/git-dolt.go index 1d77baf559..be4317728e 100644 --- a/go/cmd/git-dolt/git-dolt.go +++ b/go/cmd/git-dolt/git-dolt.go @@ -20,7 +20,7 @@ import ( "os" "os/exec" - "github.com/liquidata-inc/ld/dolt/go/cmd/git-dolt/commands" + "github.com/liquidata-inc/dolt/go/cmd/git-dolt/commands" ) func main() { diff --git a/go/go.mod b/go/go.mod index c8679619b8..6cdea95ee5 100644 --- a/go/go.mod +++ b/go/go.mod @@ -1,4 +1,4 @@ -module github.com/liquidata-inc/ld/dolt/go +module github.com/liquidata-inc/dolt/go require ( cloud.google.com/go v0.43.0 diff --git a/go/libraries/doltcore/creds/creds.go b/go/libraries/doltcore/creds/creds.go index 9158481617..a201cf423c 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/ld/dolt/go/libraries/utils/set" - "github.com/liquidata-inc/ld/dolt/go/store/util/datetime" + "github.com/liquidata-inc/dolt/go/libraries/utils/set" + "github.com/liquidata-inc/dolt/go/store/util/datetime" ) const ( diff --git a/go/libraries/doltcore/creds/jwk.go b/go/libraries/doltcore/creds/jwk.go index 3a6facf489..121ec74d6b 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/ld/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/iohelp" + "github.com/liquidata-inc/dolt/go/libraries/utils/filesys" + "github.com/liquidata-inc/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 87a2b7256a..43117ea396 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/ld/dolt/go/libraries/utils/filesys" + "github.com/liquidata-inc/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 ddd0ba84b1..59ac8fdb13 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/ld/dolt/go/store/chunks" - "github.com/liquidata-inc/ld/dolt/go/store/datas" - "github.com/liquidata-inc/ld/dolt/go/store/nbs" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) const ( diff --git a/go/libraries/doltcore/dbfactory/factory.go b/go/libraries/doltcore/dbfactory/factory.go index f455f9f594..221109bff0 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/ld/dolt/go/libraries/utils/earl" - "github.com/liquidata-inc/ld/dolt/go/store/datas" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) const ( diff --git a/go/libraries/doltcore/dbfactory/factory_test.go b/go/libraries/doltcore/dbfactory/factory_test.go index 0739918680..f92f8df531 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/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/store/types" ) /* diff --git a/go/libraries/doltcore/dbfactory/file.go b/go/libraries/doltcore/dbfactory/file.go index bb523d022c..d0124df992 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/ld/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/ld/dolt/go/store/datas" - "github.com/liquidata-inc/ld/dolt/go/store/nbs" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) const ( diff --git a/go/libraries/doltcore/dbfactory/grpc.go b/go/libraries/doltcore/dbfactory/grpc.go index afd474c7f7..a9bd2cd8e3 100644 --- a/go/libraries/doltcore/dbfactory/grpc.go +++ b/go/libraries/doltcore/dbfactory/grpc.go @@ -21,11 +21,11 @@ import ( "google.golang.org/grpc" - remotesapi "github.com/liquidata-inc/ld/dolt/go/gen/proto/dolt/services/remotesapi_v1alpha1" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/remotestorage" - "github.com/liquidata-inc/ld/dolt/go/store/chunks" - "github.com/liquidata-inc/ld/dolt/go/store/datas" - "github.com/liquidata-inc/ld/dolt/go/store/types" + 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/chunks" + "github.com/liquidata-inc/dolt/go/store/datas" + "github.com/liquidata-inc/dolt/go/store/types" ) // GRPCConnectionProvider 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 e3590f8665..de1232db5c 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/ld/dolt/go/store/datas" - "github.com/liquidata-inc/ld/dolt/go/store/nbs" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/store/datas" + "github.com/liquidata-inc/dolt/go/store/nbs" + "github.com/liquidata-inc/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 9fdc357720..f735b3b9d7 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/ld/dolt/go/store/chunks" - "github.com/liquidata-inc/ld/dolt/go/store/datas" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/store/chunks" + "github.com/liquidata-inc/dolt/go/store/datas" + "github.com/liquidata-inc/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 1075813599..3a706cd942 100644 --- a/go/libraries/doltcore/diff/async_differ.go +++ b/go/libraries/doltcore/diff/async_differ.go @@ -19,8 +19,8 @@ import ( "errors" "time" - "github.com/liquidata-inc/ld/dolt/go/store/diff" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/store/diff" + "github.com/liquidata-inc/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 4d4da2b59b..aced1b64c4 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/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/pipeline" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" + "github.com/liquidata-inc/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 0f4bafb34a..f5d2df51b8 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/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/pipeline" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/untyped" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/untyped/tabular" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) const ( diff --git a/go/libraries/doltcore/diff/diff_source.go b/go/libraries/doltcore/diff/diff_source.go index 21b5aa0fd9..6e525f8a4c 100644 --- a/go/libraries/doltcore/diff/diff_source.go +++ b/go/libraries/doltcore/diff/diff_source.go @@ -19,12 +19,12 @@ import ( "io" "time" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/rowconv" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/pipeline" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/valutil" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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/liquidata-inc/dolt/go/store/types" ) const ( diff --git a/go/libraries/doltcore/diff/schema_diff.go b/go/libraries/doltcore/diff/schema_diff.go index c7a2ebc101..01122937ed 100644 --- a/go/libraries/doltcore/diff/schema_diff.go +++ b/go/libraries/doltcore/diff/schema_diff.go @@ -15,7 +15,7 @@ package diff import ( - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" + "github.com/liquidata-inc/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 2e9ef3ad21..cf860e9bb6 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/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" + "github.com/liquidata-inc/dolt/go/store/types" ) func TestDiffSchemas(t *testing.T) { diff --git a/go/libraries/doltcore/doltdb/commit.go b/go/libraries/doltcore/doltdb/commit.go index ef1a4923c0..2c24776af4 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/ld/dolt/go/store/datas" - "github.com/liquidata-inc/ld/dolt/go/store/hash" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/store/datas" + "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/liquidata-inc/dolt/go/store/types" ) const ( diff --git a/go/libraries/doltcore/doltdb/commit_meta.go b/go/libraries/doltcore/doltdb/commit_meta.go index 8e014a1b55..3e7336992e 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/ld/dolt/go/store/types" + "github.com/liquidata-inc/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 bfbfc53d88..ee0f2ac2f4 100644 --- a/go/libraries/doltcore/doltdb/commit_meta_test.go +++ b/go/libraries/doltcore/doltdb/commit_meta_test.go @@ -18,7 +18,7 @@ import ( "reflect" "testing" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/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 b2c1a4aa41..08fc764a5a 100644 --- a/go/libraries/doltcore/doltdb/commit_spec.go +++ b/go/libraries/doltcore/doltdb/commit_spec.go @@ -19,7 +19,7 @@ import ( "regexp" "strings" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/ref" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/ref" ) type stringer string diff --git a/go/libraries/doltcore/doltdb/commit_spec_test.go b/go/libraries/doltcore/doltdb/commit_spec_test.go index c9b4e2dd52..fceac3ee57 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/ld/dolt/go/libraries/utils/test" - "github.com/liquidata-inc/ld/dolt/go/store/hash" + "github.com/liquidata-inc/dolt/go/libraries/utils/test" + "github.com/liquidata-inc/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 e4f9c54982..573743c046 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/ld/dolt/go/store/types" +import "github.com/liquidata-inc/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 4e52d0f7bf..be9b9b7446 100644 --- a/go/libraries/doltcore/doltdb/doltdb.go +++ b/go/libraries/doltcore/doltdb/doltdb.go @@ -20,17 +20,17 @@ import ( "fmt" "strings" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/dbfactory" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/ref" - "github.com/liquidata-inc/ld/dolt/go/store/chunks" - "github.com/liquidata-inc/ld/dolt/go/store/spec" - "github.com/liquidata-inc/ld/dolt/go/store/types/edits" + "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/liquidata-inc/ld/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/pantoerr" - "github.com/liquidata-inc/ld/dolt/go/store/datas" - "github.com/liquidata-inc/ld/dolt/go/store/hash" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) func init() { diff --git a/go/libraries/doltcore/doltdb/doltdb_test.go b/go/libraries/doltcore/doltdb/doltdb_test.go index 4f57ced792..778260440a 100644 --- a/go/libraries/doltcore/doltdb/doltdb_test.go +++ b/go/libraries/doltcore/doltdb/doltdb_test.go @@ -22,13 +22,13 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/dbfactory" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/ref" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/test" - "github.com/liquidata-inc/ld/dolt/go/store/hash" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) const ( diff --git a/go/libraries/doltcore/doltdb/key_itr.go b/go/libraries/doltcore/doltdb/key_itr.go index 88bc4285c8..36624651a0 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/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) // 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 6dc27ad552..4b17aa1876 100644 --- a/go/libraries/doltcore/doltdb/root_val.go +++ b/go/libraries/doltcore/doltdb/root_val.go @@ -17,9 +17,9 @@ package doltdb import ( "context" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/pantoerr" - "github.com/liquidata-inc/ld/dolt/go/store/hash" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/libraries/utils/pantoerr" + "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/liquidata-inc/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 33cb3d2163..8ecc156926 100644 --- a/go/libraries/doltcore/doltdb/root_val_test.go +++ b/go/libraries/doltcore/doltdb/root_val_test.go @@ -18,7 +18,7 @@ import ( "context" "testing" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/store/types" ) func TestTableDiff(t *testing.T) { diff --git a/go/libraries/doltcore/doltdb/table.go b/go/libraries/doltcore/doltdb/table.go index dceda61875..ad98135e52 100644 --- a/go/libraries/doltcore/doltdb/table.go +++ b/go/libraries/doltcore/doltdb/table.go @@ -18,12 +18,12 @@ import ( "context" "regexp" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema/encoding" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/pantoerr" - "github.com/liquidata-inc/ld/dolt/go/store/hash" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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/pantoerr" + "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/liquidata-inc/dolt/go/store/types" ) const ( diff --git a/go/libraries/doltcore/doltdb/table_test.go b/go/libraries/doltcore/doltdb/table_test.go index 18a2c3e1c4..d74b006649 100644 --- a/go/libraries/doltcore/doltdb/table_test.go +++ b/go/libraries/doltcore/doltdb/table_test.go @@ -20,11 +20,11 @@ import ( "github.com/google/uuid" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/dbfactory" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema/encoding" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) var id0, _ = uuid.NewRandom() diff --git a/go/libraries/doltcore/dtestutils/data.go b/go/libraries/doltcore/dtestutils/data.go index afeaeb0ce4..72770adecb 100644 --- a/go/libraries/doltcore/dtestutils/data.go +++ b/go/libraries/doltcore/dtestutils/data.go @@ -21,11 +21,11 @@ import ( "github.com/google/uuid" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/untyped" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) var UUIDS = []uuid.UUID{ diff --git a/go/libraries/doltcore/dtestutils/environment.go b/go/libraries/doltcore/dtestutils/environment.go index 3f00b576ed..34f09c2c36 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/ld/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) const ( diff --git a/go/libraries/doltcore/dtestutils/schema.go b/go/libraries/doltcore/dtestutils/schema.go index 1a2a479202..575875bd68 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/ld/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/typed/noms" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) // CreateSchema returns a schema from the columns given, panicking on any errors. diff --git a/go/libraries/doltcore/env/actions/branch.go b/go/libraries/doltcore/env/actions/branch.go index e9b8675c31..c947804c3d 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/ld/dolt/go/libraries/doltcore/ref" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/ref" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/set" - "github.com/liquidata-inc/ld/dolt/go/store/hash" + "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/liquidata-inc/dolt/go/store/hash" ) 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 d634443e83..d5883f70ba 100644 --- a/go/libraries/doltcore/env/actions/commit.go +++ b/go/libraries/doltcore/env/actions/commit.go @@ -20,10 +20,10 @@ import ( "github.com/pkg/errors" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/config" - "github.com/liquidata-inc/ld/dolt/go/store/hash" + "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" ) var ErrNameNotConfigured = errors.New("name not configured") diff --git a/go/libraries/doltcore/env/actions/creds.go b/go/libraries/doltcore/env/actions/creds.go index abcc87602c..86f177a806 100644 --- a/go/libraries/doltcore/env/actions/creds.go +++ b/go/libraries/doltcore/env/actions/creds.go @@ -15,10 +15,10 @@ package actions import ( - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/cli" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/errhand" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/creds" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env" + "github.com/liquidata-inc/dolt/go/cmd/dolt/cli" + "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" ) func NewCredsFile(dEnv *env.DoltEnv) (string, creds.DoltCreds, errhand.VerboseError) { diff --git a/go/libraries/doltcore/env/actions/diffs.go b/go/libraries/doltcore/env/actions/diffs.go index bcdcf26534..a8eba42188 100644 --- a/go/libraries/doltcore/env/actions/diffs.go +++ b/go/libraries/doltcore/env/actions/diffs.go @@ -18,8 +18,8 @@ import ( "context" "sort" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/env" ) type TableDiffType int diff --git a/go/libraries/doltcore/env/actions/merge.go b/go/libraries/doltcore/env/actions/merge.go index 297f98109c..19b40bd881 100644 --- a/go/libraries/doltcore/env/actions/merge.go +++ b/go/libraries/doltcore/env/actions/merge.go @@ -17,9 +17,9 @@ package actions import ( "context" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/merge" + "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" ) func MergeCommits(ctx context.Context, ddb *doltdb.DoltDB, cm1, cm2 *doltdb.Commit) (*doltdb.RootValue, map[string]*merge.MergeStats, error) { diff --git a/go/libraries/doltcore/env/actions/remotes.go b/go/libraries/doltcore/env/actions/remotes.go index 860d036640..d3f00c8921 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/ld/dolt/go/libraries/doltcore/ref" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/ref" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/ld/dolt/go/store/datas" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" + "github.com/liquidata-inc/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 cd33e78d26..79588b7306 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/ld/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/merge" + "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" ) type AutoResolveStats struct { diff --git a/go/libraries/doltcore/env/actions/staged.go b/go/libraries/doltcore/env/actions/staged.go index c763261e3a..880a54cabb 100644 --- a/go/libraries/doltcore/env/actions/staged.go +++ b/go/libraries/doltcore/env/actions/staged.go @@ -18,9 +18,9 @@ import ( "context" "errors" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/set" + "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" ) 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 641da77b93..e96f9594f5 100644 --- a/go/libraries/doltcore/env/actions/table.go +++ b/go/libraries/doltcore/env/actions/table.go @@ -17,8 +17,8 @@ package actions import ( "context" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/env" ) func CheckoutAllTables(ctx context.Context, dEnv *env.DoltEnv) error { diff --git a/go/libraries/doltcore/env/config.go b/go/libraries/doltcore/env/config.go index c433031d32..0f4158e698 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/ld/dolt/go/libraries/doltcore/dbfactory" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/dbfactory" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/config" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/set" + "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" ) const ( diff --git a/go/libraries/doltcore/env/environment.go b/go/libraries/doltcore/env/environment.go index 7c87fba1a3..c7f13f9c8c 100644 --- a/go/libraries/doltcore/env/environment.go +++ b/go/libraries/doltcore/env/environment.go @@ -25,16 +25,16 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/errhand" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/creds" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/dbfactory" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/ref" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema/encoding" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/ld/dolt/go/store/hash" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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/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/libraries/utils/filesys" + "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/liquidata-inc/dolt/go/store/types" ) const ( diff --git a/go/libraries/doltcore/env/environment_test.go b/go/libraries/doltcore/env/environment_test.go index 14a2d9d5f2..dd28aa568d 100644 --- a/go/libraries/doltcore/env/environment_test.go +++ b/go/libraries/doltcore/env/environment_test.go @@ -20,12 +20,12 @@ import ( "path/filepath" "testing" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/dbfactory" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/ref" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/ld/dolt/go/store/hash" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) const ( diff --git a/go/libraries/doltcore/env/paths.go b/go/libraries/doltcore/env/paths.go index f2f4bbb81f..e39f2e2947 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/ld/dolt/go/libraries/doltcore/dbfactory" + "github.com/liquidata-inc/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 699ecb25dd..d7f893d10c 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/ld/dolt/go/libraries/doltcore/dbfactory" + "github.com/liquidata-inc/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 0c5cca99c3..661bb50c6c 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/ld/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" + "github.com/liquidata-inc/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 a88d5a8296..79a568c1ba 100644 --- a/go/libraries/doltcore/env/repo_state.go +++ b/go/libraries/doltcore/env/repo_state.go @@ -17,10 +17,10 @@ package env import ( "encoding/json" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/ref" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/ld/dolt/go/store/hash" + "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" ) type BranchConfig struct { diff --git a/go/libraries/doltcore/merge/conflict_sink.go b/go/libraries/doltcore/merge/conflict_sink.go index a0625992f8..cf148e0c20 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/ld/dolt/go/libraries/doltcore/diff" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/pipeline" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/untyped" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/untyped/tabular" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) var WriteBufSize = 256 * 1024 diff --git a/go/libraries/doltcore/merge/conflict_source.go b/go/libraries/doltcore/merge/conflict_source.go index 375c148302..b9478358f8 100644 --- a/go/libraries/doltcore/merge/conflict_source.go +++ b/go/libraries/doltcore/merge/conflict_source.go @@ -18,13 +18,13 @@ import ( "context" "io" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/rowconv" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/pipeline" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/untyped" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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/libraries/doltcore/table/untyped" + "github.com/liquidata-inc/dolt/go/store/types" ) const ( diff --git a/go/libraries/doltcore/merge/merge.go b/go/libraries/doltcore/merge/merge.go index 369dd1867a..4db83c7e60 100644 --- a/go/libraries/doltcore/merge/merge.go +++ b/go/libraries/doltcore/merge/merge.go @@ -18,13 +18,13 @@ import ( "context" "errors" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema/encoding" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/typed" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/valutil" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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/typed" + "github.com/liquidata-inc/dolt/go/libraries/utils/valutil" + "github.com/liquidata-inc/dolt/go/store/types" ) var ErrFastForward = errors.New("fast forward") diff --git a/go/libraries/doltcore/merge/merge_test.go b/go/libraries/doltcore/merge/merge_test.go index e34d382bd6..7a7bf3a1f2 100644 --- a/go/libraries/doltcore/merge/merge_test.go +++ b/go/libraries/doltcore/merge/merge_test.go @@ -22,11 +22,11 @@ import ( "github.com/google/uuid" "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/ref" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema/encoding" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) type RowMergeTest struct { diff --git a/go/libraries/doltcore/merge/resolve.go b/go/libraries/doltcore/merge/resolve.go index 24129aea1d..954a48535f 100644 --- a/go/libraries/doltcore/merge/resolve.go +++ b/go/libraries/doltcore/merge/resolve.go @@ -17,11 +17,11 @@ package merge import ( "context" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema/encoding" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) 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 2abfa1eb85..f01c545aec 100644 --- a/go/libraries/doltcore/mvdata/data_loc.go +++ b/go/libraries/doltcore/mvdata/data_loc.go @@ -22,16 +22,16 @@ import ( "github.com/pkg/errors" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/typed/json" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/typed/noms" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/untyped/csv" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/untyped/sqlexport" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/untyped/xlsx" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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/liquidata-inc/dolt/go/store/types" ) type DataFormat string diff --git a/go/libraries/doltcore/mvdata/data_loc_test.go b/go/libraries/doltcore/mvdata/data_loc_test.go index 533bde6085..22128af829 100644 --- a/go/libraries/doltcore/mvdata/data_loc_test.go +++ b/go/libraries/doltcore/mvdata/data_loc_test.go @@ -19,16 +19,16 @@ import ( "reflect" "testing" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema/encoding" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/typed/json" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/typed/noms" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/untyped/csv" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) var testSchema = ` diff --git a/go/libraries/doltcore/mvdata/data_mover.go b/go/libraries/doltcore/mvdata/data_mover.go index fa850173da..da3580733d 100644 --- a/go/libraries/doltcore/mvdata/data_mover.go +++ b/go/libraries/doltcore/mvdata/data_mover.go @@ -19,17 +19,17 @@ import ( "errors" "strings" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/typed/noms" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/typed/noms" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/rowconv" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema/encoding" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/pipeline" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/funcitr" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/set" + "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/encoding" + "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/liquidata-inc/dolt/go/libraries/utils/funcitr" + "github.com/liquidata-inc/dolt/go/libraries/utils/set" ) type MoveOperation string diff --git a/go/libraries/doltcore/mvdata/data_mover_test.go b/go/libraries/doltcore/mvdata/data_mover_test.go index f56a2341ec..134a2c506d 100644 --- a/go/libraries/doltcore/mvdata/data_mover_test.go +++ b/go/libraries/doltcore/mvdata/data_mover_test.go @@ -18,8 +18,8 @@ import ( "context" "testing" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema/encoding" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema/encoding" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/table" ) const ( diff --git a/go/libraries/doltcore/ref/ref_spec.go b/go/libraries/doltcore/ref/ref_spec.go index dc550866b6..a983c67a81 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/ld/dolt/go/libraries/utils/strhelp" + "github.com/liquidata-inc/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 926f34ce8e..9d41cacc98 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/ld/dolt/go/libraries/utils/strhelp" + "github.com/liquidata-inc/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 cf728a7319..9662c7a12b 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/ld/dolt/go/store/chunks" - "github.com/liquidata-inc/ld/dolt/go/store/hash" + "github.com/liquidata-inc/dolt/go/store/chunks" + "github.com/liquidata-inc/dolt/go/store/hash" ) // 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 e23fa977ac..5a05c43013 100644 --- a/go/libraries/doltcore/remotestorage/chunk_store.go +++ b/go/libraries/doltcore/remotestorage/chunk_store.go @@ -29,12 +29,12 @@ import ( "github.com/cenkalti/backoff" "github.com/golang/snappy" - remotesapi "github.com/liquidata-inc/ld/dolt/go/gen/proto/dolt/services/remotesapi_v1alpha1" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/iohelp" - "github.com/liquidata-inc/ld/dolt/go/store/chunks" - "github.com/liquidata-inc/ld/dolt/go/store/hash" - "github.com/liquidata-inc/ld/dolt/go/store/nbs" - "github.com/liquidata-inc/ld/dolt/go/store/types" + 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/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" ) var ErrUploadFailed = errors.New("upload failed") diff --git a/go/libraries/doltcore/remotestorage/map_chunk_cache.go b/go/libraries/doltcore/remotestorage/map_chunk_cache.go index 9c2a537d5a..2196e9bee7 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/ld/dolt/go/store/chunks" - "github.com/liquidata-inc/ld/dolt/go/store/hash" + "github.com/liquidata-inc/dolt/go/store/chunks" + "github.com/liquidata-inc/dolt/go/store/hash" ) // 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 7d4d4a79c4..cbf18b3727 100644 --- a/go/libraries/doltcore/remotestorage/map_chunk_cache_test.go +++ b/go/libraries/doltcore/remotestorage/map_chunk_cache_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/ld/dolt/go/store/chunks" - "github.com/liquidata-inc/ld/dolt/go/store/hash" + "github.com/liquidata-inc/dolt/go/store/chunks" + "github.com/liquidata-inc/dolt/go/store/hash" ) func genRandomChunks(rng *rand.Rand, n int) (hash.HashSet, []chunks.Chunk) { diff --git a/go/libraries/doltcore/remotestorage/retrying_cssclient.go b/go/libraries/doltcore/remotestorage/retrying_cssclient.go index 79c0e820e3..8717377f19 100644 --- a/go/libraries/doltcore/remotestorage/retrying_cssclient.go +++ b/go/libraries/doltcore/remotestorage/retrying_cssclient.go @@ -20,7 +20,7 @@ import ( "github.com/cenkalti/backoff" "google.golang.org/grpc" - remotesapi "github.com/liquidata-inc/ld/dolt/go/gen/proto/dolt/services/remotesapi_v1alpha1" + remotesapi "github.com/liquidata-inc/dolt/go/gen/proto/dolt/services/remotesapi_v1alpha1" ) const ( diff --git a/go/libraries/doltcore/remotestorage/utils.go b/go/libraries/doltcore/remotestorage/utils.go index 9dcdd349c5..5178fc680f 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/ld/dolt/go/store/hash" +import "github.com/liquidata-inc/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 a7f48059f8..fb86f8a2e2 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/ld/dolt/go/store/hash" + "github.com/liquidata-inc/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 1ef72bd6c7..f0e375d20c 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/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" + "github.com/liquidata-inc/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 9e5401ad5b..68d95785b9 100644 --- a/go/libraries/doltcore/row/noms_row.go +++ b/go/libraries/doltcore/row/noms_row.go @@ -15,8 +15,8 @@ package row import ( - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" + "github.com/liquidata-inc/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 e713f10b8d..b432aef14d 100644 --- a/go/libraries/doltcore/row/noms_row_test.go +++ b/go/libraries/doltcore/row/noms_row_test.go @@ -21,8 +21,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" + "github.com/liquidata-inc/dolt/go/store/types" ) const ( diff --git a/go/libraries/doltcore/row/row.go b/go/libraries/doltcore/row/row.go index 2d72514665..f121f84a0f 100644 --- a/go/libraries/doltcore/row/row.go +++ b/go/libraries/doltcore/row/row.go @@ -17,9 +17,9 @@ package row import ( "errors" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/valutil" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) 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 6e4b977dcb..12dbdf0219 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/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" + "github.com/liquidata-inc/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 48d8ed24fd..6d7d190c08 100644 --- a/go/libraries/doltcore/row/tagged_values.go +++ b/go/libraries/doltcore/row/tagged_values.go @@ -18,7 +18,7 @@ import ( "context" "fmt" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/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 c726e17c43..2d11078342 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/ld/dolt/go/store/types" + "github.com/liquidata-inc/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 20b7c5da8f..adc19b4945 100644 --- a/go/libraries/doltcore/rowconv/field_mapping.go +++ b/go/libraries/doltcore/rowconv/field_mapping.go @@ -20,9 +20,9 @@ import ( "fmt" "strconv" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/untyped" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/filesys" + "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" ) // 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 a2fe91c4c0..cd16a8a460 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/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) var fieldsA, _ = schema.NewColCollection( diff --git a/go/libraries/doltcore/rowconv/row_converter.go b/go/libraries/doltcore/rowconv/row_converter.go index 83fd791f3e..75168cc9d6 100644 --- a/go/libraries/doltcore/rowconv/row_converter.go +++ b/go/libraries/doltcore/rowconv/row_converter.go @@ -17,12 +17,12 @@ package rowconv import ( "fmt" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/pipeline" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/pantoerr" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/libraries/doltcore" + "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/utils/pantoerr" + "github.com/liquidata-inc/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 f4b939586f..22fb88cc01 100644 --- a/go/libraries/doltcore/rowconv/row_converter_test.go +++ b/go/libraries/doltcore/rowconv/row_converter_test.go @@ -20,10 +20,10 @@ import ( "github.com/google/uuid" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/pipeline" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) var srcCols, _ = schema.NewColCollection( diff --git a/go/libraries/doltcore/schema/alterschema/addcolumn.go b/go/libraries/doltcore/schema/alterschema/addcolumn.go index 9d8719f162..55e74d8d8d 100644 --- a/go/libraries/doltcore/schema/alterschema/addcolumn.go +++ b/go/libraries/doltcore/schema/alterschema/addcolumn.go @@ -17,11 +17,11 @@ package alterschema import ( "context" - "github.com/liquidata-inc/ld/dolt/go/cmd/dolt/errhand" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema/encoding" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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/schema" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema/encoding" + "github.com/liquidata-inc/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 5948f4561e..fa77bef0cd 100644 --- a/go/libraries/doltcore/schema/alterschema/addcolumn_test.go +++ b/go/libraries/doltcore/schema/alterschema/addcolumn_test.go @@ -22,13 +22,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/dtestutils" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/typed/noms" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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/table" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/typed/noms" + "github.com/liquidata-inc/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 0afccb8c90..b878a40eb9 100644 --- a/go/libraries/doltcore/schema/alterschema/dropcolumn.go +++ b/go/libraries/doltcore/schema/alterschema/dropcolumn.go @@ -18,9 +18,9 @@ import ( "context" "errors" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/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/schema/encoding" ) // DropColumn drops a column from a table. No existing rows are modified, but a new schema entry is written. diff --git a/go/libraries/doltcore/schema/alterschema/dropcolumn_test.go b/go/libraries/doltcore/schema/alterschema/dropcolumn_test.go index cbcb55b73d..c6bbd91df2 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/ld/dolt/go/libraries/doltcore/dtestutils" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) func TestDropColumn(t *testing.T) { diff --git a/go/libraries/doltcore/schema/alterschema/renamecolumn.go b/go/libraries/doltcore/schema/alterschema/renamecolumn.go index e5396fab96..6f24c3d7cf 100644 --- a/go/libraries/doltcore/schema/alterschema/renamecolumn.go +++ b/go/libraries/doltcore/schema/alterschema/renamecolumn.go @@ -17,9 +17,9 @@ package alterschema import ( "context" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/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/schema/encoding" ) // RenameColumn takes a table and renames a column from oldName to newName diff --git a/go/libraries/doltcore/schema/alterschema/renamecolumn_test.go b/go/libraries/doltcore/schema/alterschema/renamecolumn_test.go index 93a5bf6a47..a15b7824f6 100644 --- a/go/libraries/doltcore/schema/alterschema/renamecolumn_test.go +++ b/go/libraries/doltcore/schema/alterschema/renamecolumn_test.go @@ -21,10 +21,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/dtestutils" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) func TestRenameColumn(t *testing.T) { diff --git a/go/libraries/doltcore/schema/alterschema/renametable.go b/go/libraries/doltcore/schema/alterschema/renametable.go index ca4ea2d23e..0c0a75dd3c 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/ld/dolt/go/libraries/doltcore/doltdb" + "github.com/liquidata-inc/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 b8f75d9b14..986e0613f6 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/ld/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/dtestutils" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) 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 70a517838c..a9d7fdba6d 100644 --- a/go/libraries/doltcore/schema/col_coll_test.go +++ b/go/libraries/doltcore/schema/col_coll_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/store/types" ) var firstNameCol = Column{"first", 0, types.StringKind, false, nil} diff --git a/go/libraries/doltcore/schema/column.go b/go/libraries/doltcore/schema/column.go index 4170de06d1..51d91bb992 100644 --- a/go/libraries/doltcore/schema/column.go +++ b/go/libraries/doltcore/schema/column.go @@ -18,7 +18,7 @@ import ( "math" "strings" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/store/types" ) // KindToLwrStr maps a noms kind to the kinds lowercased name diff --git a/go/libraries/doltcore/schema/constraint.go b/go/libraries/doltcore/schema/constraint.go index bb7658d300..9b74a96a6e 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/ld/dolt/go/store/types" + "github.com/liquidata-inc/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 9133e44444..44091ae331 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/ld/dolt/go/store/types" + "github.com/liquidata-inc/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 4fe58515d2..d06d86ed81 100644 --- a/go/libraries/doltcore/schema/encoding/schema_marshaling.go +++ b/go/libraries/doltcore/schema/encoding/schema_marshaling.go @@ -19,9 +19,9 @@ import ( "encoding/json" "errors" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/store/marshal" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" + "github.com/liquidata-inc/dolt/go/store/marshal" + "github.com/liquidata-inc/dolt/go/store/types" ) type encodedColumn struct { diff --git a/go/libraries/doltcore/schema/encoding/schema_marshaling_test.go b/go/libraries/doltcore/schema/encoding/schema_marshaling_test.go index 5776eb2b06..c26e42d847 100644 --- a/go/libraries/doltcore/schema/encoding/schema_marshaling_test.go +++ b/go/libraries/doltcore/schema/encoding/schema_marshaling_test.go @@ -19,9 +19,9 @@ import ( "reflect" "testing" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/dbfactory" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/dbfactory" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" + "github.com/liquidata-inc/dolt/go/store/types" ) const expectedSQL = `CREATE TABLE %s ( diff --git a/go/libraries/doltcore/schema/schema_test.go b/go/libraries/doltcore/schema/schema_test.go index 0145e39ce6..f44c47b0c7 100644 --- a/go/libraries/doltcore/schema/schema_test.go +++ b/go/libraries/doltcore/schema/schema_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/store/types" ) const ( diff --git a/go/libraries/doltcore/sql/filter.go b/go/libraries/doltcore/sql/filter.go index eda676682a..4a6bd997c3 100644 --- a/go/libraries/doltcore/sql/filter.go +++ b/go/libraries/doltcore/sql/filter.go @@ -17,9 +17,9 @@ package sql import ( "vitess.io/vitess/go/vt/sqlparser" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) // Boolean predicate func type to filter rows in result sets diff --git a/go/libraries/doltcore/sql/orderby.go b/go/libraries/doltcore/sql/orderby.go index 645ff43ce1..4a903c2c90 100644 --- a/go/libraries/doltcore/sql/orderby.go +++ b/go/libraries/doltcore/sql/orderby.go @@ -17,9 +17,9 @@ package sql import ( "vitess.io/vitess/go/vt/sqlparser" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/pipeline" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" "sort" ) diff --git a/go/libraries/doltcore/sql/resolve.go b/go/libraries/doltcore/sql/resolve.go index 5c7d80d1ad..d419e50e90 100644 --- a/go/libraries/doltcore/sql/resolve.go +++ b/go/libraries/doltcore/sql/resolve.go @@ -19,7 +19,7 @@ import ( "vitess.io/vitess/go/vt/sqlparser" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" ) // A qualified column names its table and its column. diff --git a/go/libraries/doltcore/sql/schema.go b/go/libraries/doltcore/sql/schema.go index 08bebd59df..4bc6ac15c3 100644 --- a/go/libraries/doltcore/sql/schema.go +++ b/go/libraries/doltcore/sql/schema.go @@ -18,7 +18,7 @@ import ( "fmt" "strings" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" ) // SchemaAsCreateStmt takes a Schema and returns a string representing a SQL create table command that could be used to diff --git a/go/libraries/doltcore/sql/schema_test.go b/go/libraries/doltcore/sql/schema_test.go index 3cdb4b0618..21436ec585 100644 --- a/go/libraries/doltcore/sql/schema_test.go +++ b/go/libraries/doltcore/sql/schema_test.go @@ -15,9 +15,9 @@ package sql import ( - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/sql/sqltestutil" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" "testing" diff --git a/go/libraries/doltcore/sql/sqlddl.go b/go/libraries/doltcore/sql/sqlddl.go index 4c2ee541a3..d2830d177c 100644 --- a/go/libraries/doltcore/sql/sqlddl.go +++ b/go/libraries/doltcore/sql/sqlddl.go @@ -23,11 +23,11 @@ import ( "vitess.io/vitess/go/vt/sqlparser" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema/alterschema" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema/encoding" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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/store/types" ) // For some reason these constants are private in the sql parser library, so we need to either fork that package or diff --git a/go/libraries/doltcore/sql/sqlddl_test.go b/go/libraries/doltcore/sql/sqlddl_test.go index 3d2bb11e86..3c68a1ee8f 100644 --- a/go/libraries/doltcore/sql/sqlddl_test.go +++ b/go/libraries/doltcore/sql/sqlddl_test.go @@ -22,11 +22,11 @@ import ( "github.com/stretchr/testify/require" "vitess.io/vitess/go/vt/sqlparser" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/dtestutils" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - . "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/sql/sqltestutil" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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/liquidata-inc/dolt/go/store/types" ) func TestExecuteCreate(t *testing.T) { diff --git a/go/libraries/doltcore/sql/sqldelete.go b/go/libraries/doltcore/sql/sqldelete.go index e0a5205c19..622f6dd333 100644 --- a/go/libraries/doltcore/sql/sqldelete.go +++ b/go/libraries/doltcore/sql/sqldelete.go @@ -22,10 +22,10 @@ import ( "vitess.io/vitess/go/vt/sqlparser" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/typed/noms" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/untyped/resultset" + "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/typed/noms" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/untyped/resultset" ) type DeleteResult struct { diff --git a/go/libraries/doltcore/sql/sqldelete_test.go b/go/libraries/doltcore/sql/sqldelete_test.go index c4dff5ed4c..dca8eca2c3 100644 --- a/go/libraries/doltcore/sql/sqldelete_test.go +++ b/go/libraries/doltcore/sql/sqldelete_test.go @@ -22,10 +22,10 @@ import ( "github.com/stretchr/testify/require" "vitess.io/vitess/go/vt/sqlparser" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/dtestutils" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - . "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/sql/sqltestutil" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) func TestExecuteDelete(t *testing.T) { diff --git a/go/libraries/doltcore/sql/sqlinsert.go b/go/libraries/doltcore/sql/sqlinsert.go index e6a3c9ecd6..ec5b5144df 100644 --- a/go/libraries/doltcore/sql/sqlinsert.go +++ b/go/libraries/doltcore/sql/sqlinsert.go @@ -22,11 +22,11 @@ import ( "vitess.io/vitess/go/vt/sqlparser" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/store/hash" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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/hash" + "github.com/liquidata-inc/dolt/go/store/types" ) type InsertResult struct { diff --git a/go/libraries/doltcore/sql/sqlinsert_test.go b/go/libraries/doltcore/sql/sqlinsert_test.go index af685eae44..561e34ce9f 100644 --- a/go/libraries/doltcore/sql/sqlinsert_test.go +++ b/go/libraries/doltcore/sql/sqlinsert_test.go @@ -24,10 +24,10 @@ import ( "github.com/stretchr/testify/require" "vitess.io/vitess/go/vt/sqlparser" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/dtestutils" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - . "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/sql/sqltestutil" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) func TestExecuteInsert(t *testing.T) { diff --git a/go/libraries/doltcore/sql/sqlselect.go b/go/libraries/doltcore/sql/sqlselect.go index e7be8bf12e..a0adc58430 100644 --- a/go/libraries/doltcore/sql/sqlselect.go +++ b/go/libraries/doltcore/sql/sqlselect.go @@ -22,13 +22,13 @@ import ( "vitess.io/vitess/go/vt/sqlparser" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/pipeline" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/typed/noms" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/untyped/resultset" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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/table/pipeline" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/typed/noms" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/untyped/resultset" + "github.com/liquidata-inc/dolt/go/store/types" ) // No limit marker for limit statements in select diff --git a/go/libraries/doltcore/sql/sqlselect_test.go b/go/libraries/doltcore/sql/sqlselect_test.go index aa52cecce2..e14e2e174b 100644 --- a/go/libraries/doltcore/sql/sqlselect_test.go +++ b/go/libraries/doltcore/sql/sqlselect_test.go @@ -22,11 +22,11 @@ import ( "github.com/stretchr/testify/require" "vitess.io/vitess/go/vt/sqlparser" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/dtestutils" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - . "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/sql/sqltestutil" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/pipeline" + "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/liquidata-inc/dolt/go/libraries/doltcore/table/pipeline" ) func TestExecuteSelect(t *testing.T) { diff --git a/go/libraries/doltcore/sql/sqlshow.go b/go/libraries/doltcore/sql/sqlshow.go index ce69050ac2..9ee0de138c 100644 --- a/go/libraries/doltcore/sql/sqlshow.go +++ b/go/libraries/doltcore/sql/sqlshow.go @@ -21,11 +21,11 @@ import ( "vitess.io/vitess/go/vt/sqlparser" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/pipeline" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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/table/pipeline" + "github.com/liquidata-inc/dolt/go/store/types" ) func ExecuteShow(ctx context.Context, root *doltdb.RootValue, show *sqlparser.Show) ([]row.Row, schema.Schema, error) { diff --git a/go/libraries/doltcore/sql/sqlshow_test.go b/go/libraries/doltcore/sql/sqlshow_test.go index c8ef583581..3b661d86d9 100644 --- a/go/libraries/doltcore/sql/sqlshow_test.go +++ b/go/libraries/doltcore/sql/sqlshow_test.go @@ -22,11 +22,11 @@ import ( "github.com/stretchr/testify/require" "vitess.io/vitess/go/vt/sqlparser" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/dtestutils" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - . "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/sql/sqltestutil" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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/liquidata-inc/dolt/go/store/types" ) func TestExecuteShow(t *testing.T) { diff --git a/go/libraries/doltcore/sql/sqltestutil/data.go b/go/libraries/doltcore/sql/sqltestutil/data.go index 34f742e1c1..f9cb0c774a 100644 --- a/go/libraries/doltcore/sql/sqltestutil/data.go +++ b/go/libraries/doltcore/sql/sqltestutil/data.go @@ -20,12 +20,12 @@ import ( "github.com/google/uuid" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/dtestutils" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/untyped" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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/table/untyped" + "github.com/liquidata-inc/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/sql/sqltestutil/schema.go b/go/libraries/doltcore/sql/sqltestutil/schema.go index 26412540f5..8ed7896dae 100644 --- a/go/libraries/doltcore/sql/sqltestutil/schema.go +++ b/go/libraries/doltcore/sql/sqltestutil/schema.go @@ -18,9 +18,9 @@ import ( "fmt" "strconv" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) // 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/sql/sqltestutil/selectqueries.go b/go/libraries/doltcore/sql/sqltestutil/selectqueries.go index e1e8b3214d..52de7d858b 100644 --- a/go/libraries/doltcore/sql/sqltestutil/selectqueries.go +++ b/go/libraries/doltcore/sql/sqltestutil/selectqueries.go @@ -17,12 +17,12 @@ package sqltestutil import ( "testing" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/dtestutils" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/untyped/resultset" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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/table/untyped/resultset" + "github.com/liquidata-inc/dolt/go/store/types" ) // This file defines test queries and expected results. The purpose of defining them here is to make them portable -- diff --git a/go/libraries/doltcore/sql/sqltypes.go b/go/libraries/doltcore/sql/sqltypes.go index d4e945caed..064b499cb2 100644 --- a/go/libraries/doltcore/sql/sqltypes.go +++ b/go/libraries/doltcore/sql/sqltypes.go @@ -15,7 +15,7 @@ package sql import ( - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/store/types" ) var DoltToSQLType = map[types.NomsKind]string{ diff --git a/go/libraries/doltcore/sql/sqlupdate.go b/go/libraries/doltcore/sql/sqlupdate.go index 87d63bcbad..5013340ae5 100644 --- a/go/libraries/doltcore/sql/sqlupdate.go +++ b/go/libraries/doltcore/sql/sqlupdate.go @@ -22,11 +22,11 @@ import ( "vitess.io/vitess/go/vt/sqlparser" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/typed/noms" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/untyped/resultset" + "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/table/typed/noms" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/untyped/resultset" ) type UpdateResult struct { diff --git a/go/libraries/doltcore/sql/sqlupdate_test.go b/go/libraries/doltcore/sql/sqlupdate_test.go index 195092627f..2cbc7e7145 100644 --- a/go/libraries/doltcore/sql/sqlupdate_test.go +++ b/go/libraries/doltcore/sql/sqlupdate_test.go @@ -23,10 +23,10 @@ import ( "github.com/stretchr/testify/require" "vitess.io/vitess/go/vt/sqlparser" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/dtestutils" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - . "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/sql/sqltestutil" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) func TestExecuteUpdate(t *testing.T) { diff --git a/go/libraries/doltcore/sql/values.go b/go/libraries/doltcore/sql/values.go index d92a39f979..ca66145658 100644 --- a/go/libraries/doltcore/sql/values.go +++ b/go/libraries/doltcore/sql/values.go @@ -21,10 +21,10 @@ import ( "github.com/google/uuid" "vitess.io/vitess/go/vt/sqlparser" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/store/chunks" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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/types" ) // binaryNomsOperation knows how to combine two noms values into a single one, e.g. addition diff --git a/go/libraries/doltcore/sql/where_test.go b/go/libraries/doltcore/sql/where_test.go index a73340b795..dd8404191a 100644 --- a/go/libraries/doltcore/sql/where_test.go +++ b/go/libraries/doltcore/sql/where_test.go @@ -21,8 +21,8 @@ import ( "github.com/stretchr/testify/assert" "vitess.io/vitess/go/vt/sqlparser" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/dtestutils" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/sql/sqltestutil" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/dtestutils" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/sql/sqltestutil" ) func TestWhereClauseErrorHandling(t *testing.T) { diff --git a/go/libraries/doltcore/sqle/database.go b/go/libraries/doltcore/sqle/database.go index 4b85c1d040..3b814c83ee 100644 --- a/go/libraries/doltcore/sqle/database.go +++ b/go/libraries/doltcore/sqle/database.go @@ -19,7 +19,7 @@ import ( "github.com/src-d/go-mysql-server/sql" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/doltdb" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" ) // Database implements sql.Database for a dolt DB. diff --git a/go/libraries/doltcore/sqle/indexes.go b/go/libraries/doltcore/sqle/indexes.go index 89381ae1ac..e43c528849 100644 --- a/go/libraries/doltcore/sqle/indexes.go +++ b/go/libraries/doltcore/sqle/indexes.go @@ -22,9 +22,9 @@ import ( "github.com/src-d/go-mysql-server/sql" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) // IndexDriver implementation. Not ready for prime time. diff --git a/go/libraries/doltcore/sqle/integration_tests/stockmarket_test.go b/go/libraries/doltcore/sqle/integration_tests/stockmarket_test.go index 132e0d05e8..44bd6963bd 100644 --- a/go/libraries/doltcore/sqle/integration_tests/stockmarket_test.go +++ b/go/libraries/doltcore/sqle/integration_tests/stockmarket_test.go @@ -22,8 +22,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/dtestutils" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/sqle/sqletestutil" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/dtestutils" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/sqle/sqletestutil" ) // These tests are slow, working on making them faster. Right now they're skipped unless this env var is set. diff --git a/go/libraries/doltcore/sqle/rows.go b/go/libraries/doltcore/sqle/rows.go index 60210e82ae..edc5413f9e 100644 --- a/go/libraries/doltcore/sqle/rows.go +++ b/go/libraries/doltcore/sqle/rows.go @@ -19,9 +19,9 @@ import ( "github.com/src-d/go-mysql-server/sql" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) // An iterator over the rows of a table. diff --git a/go/libraries/doltcore/sqle/schema.go b/go/libraries/doltcore/sqle/schema.go index ca45059491..dc40840d45 100644 --- a/go/libraries/doltcore/sqle/schema.go +++ b/go/libraries/doltcore/sqle/schema.go @@ -17,7 +17,7 @@ package sqle import ( "github.com/src-d/go-mysql-server/sql" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" ) // doltSchemaToSqlSchema returns the sql.Schema corresponding to the dolt schema given. diff --git a/go/libraries/doltcore/sqle/sqletestutil/executesql.go b/go/libraries/doltcore/sqle/sqletestutil/executesql.go index da78491893..ca55ff9a28 100644 --- a/go/libraries/doltcore/sqle/sqletestutil/executesql.go +++ b/go/libraries/doltcore/sqle/sqletestutil/executesql.go @@ -25,10 +25,10 @@ import ( "github.com/src-d/go-mysql-server/sql" "vitess.io/vitess/go/vt/sqlparser" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/env" - dsql "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/sql" - dsqle "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/sqle" + "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/sql" + dsqle "github.com/liquidata-inc/dolt/go/libraries/doltcore/sqle" ) // 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/sqlselect_test.go b/go/libraries/doltcore/sqle/sqlselect_test.go index 64692e5c6e..d97c7b1b4e 100644 --- a/go/libraries/doltcore/sqle/sqlselect_test.go +++ b/go/libraries/doltcore/sqle/sqlselect_test.go @@ -24,12 +24,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/dtestutils" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - . "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/sql/sqltestutil" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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/sql/sqltestutil" + "github.com/liquidata-inc/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/tables.go b/go/libraries/doltcore/sqle/tables.go index 4df9d92ec7..04b77f2af3 100644 --- a/go/libraries/doltcore/sqle/tables.go +++ b/go/libraries/doltcore/sqle/tables.go @@ -22,8 +22,8 @@ import ( "github.com/src-d/go-mysql-server/sql" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/doltdb" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" ) // DoltTable implements the sql.Table interface and gives access to dolt table rows and schema. diff --git a/go/libraries/doltcore/sqle/types.go b/go/libraries/doltcore/sqle/types.go index 59306524b4..227ea1a4cb 100644 --- a/go/libraries/doltcore/sqle/types.go +++ b/go/libraries/doltcore/sqle/types.go @@ -20,7 +20,7 @@ import ( "github.com/google/uuid" "github.com/src-d/go-mysql-server/sql" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/store/types" ) func nomsTypeToSqlType(kind types.NomsKind) sql.Type { diff --git a/go/libraries/doltcore/str_to_noms.go b/go/libraries/doltcore/str_to_noms.go index 24a497b4be..a70e7428be 100644 --- a/go/libraries/doltcore/str_to_noms.go +++ b/go/libraries/doltcore/str_to_noms.go @@ -22,7 +22,7 @@ import ( "github.com/google/uuid" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/store/types" ) // StringToValue takes a string and a NomsKind and tries to convert the string to a noms Value. diff --git a/go/libraries/doltcore/str_to_noms_test.go b/go/libraries/doltcore/str_to_noms_test.go index edf6c626dd..574abb114c 100644 --- a/go/libraries/doltcore/str_to_noms_test.go +++ b/go/libraries/doltcore/str_to_noms_test.go @@ -17,7 +17,7 @@ package doltcore import ( "testing" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/store/types" ) type strToNomsTypeTests struct { diff --git a/go/libraries/doltcore/table/errors.go b/go/libraries/doltcore/table/errors.go index 0a317fbbc6..4c0b209b91 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/ld/dolt/go/libraries/doltcore/row" + "github.com/liquidata-inc/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 b30f62b169..18f6e7a6ed 100644 --- a/go/libraries/doltcore/table/errors_test.go +++ b/go/libraries/doltcore/table/errors_test.go @@ -17,9 +17,9 @@ package table import ( "testing" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) func TestBadRow(t *testing.T) { diff --git a/go/libraries/doltcore/table/inmem_table.go b/go/libraries/doltcore/table/inmem_table.go index 8c051f8a4c..39aa19381d 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/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) // 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 2498c0f5af..41fbc668f1 100644 --- a/go/libraries/doltcore/table/inmem_table_test.go +++ b/go/libraries/doltcore/table/inmem_table_test.go @@ -19,9 +19,9 @@ import ( "io" "testing" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) const ( diff --git a/go/libraries/doltcore/table/io.go b/go/libraries/doltcore/table/io.go index b5e3c16849..c4233107ee 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/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" + "github.com/liquidata-inc/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 a0c159682d..d8188f63e3 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/ld/dolt/go/libraries/doltcore/row" + "github.com/liquidata-inc/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 e4e12ecf62..2294ee7800 100644 --- a/go/libraries/doltcore/table/pipeline/errors_test.go +++ b/go/libraries/doltcore/table/pipeline/errors_test.go @@ -17,9 +17,9 @@ package pipeline import ( "testing" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/untyped" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) func TestTransformRowFailure(t *testing.T) { diff --git a/go/libraries/doltcore/table/pipeline/pipeline.go b/go/libraries/doltcore/table/pipeline/pipeline.go index 97245982e5..c7c6e323eb 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/ld/dolt/go/libraries/doltcore/row" + "github.com/liquidata-inc/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 6b5e4f51a3..6475fced3f 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/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" + "github.com/liquidata-inc/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 93c8c799f3..6a86091cda 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/ld/dolt/go/libraries/doltcore/row" +import "github.com/liquidata-inc/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 7ead05c24a..60025b71ce 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/ld/dolt/go/libraries/doltcore/row" + "github.com/liquidata-inc/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 e8c3dbed6b..30a993958d 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/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/untyped" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/untyped/csv" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/iohelp" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) var inCSV = `first,last,film or show,year diff --git a/go/libraries/doltcore/table/typed/json/file_info.go b/go/libraries/doltcore/table/typed/json/file_info.go index 5cbac7fff6..2da611f91c 100644 --- a/go/libraries/doltcore/table/typed/json/file_info.go +++ b/go/libraries/doltcore/table/typed/json/file_info.go @@ -14,7 +14,7 @@ package json -import "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" +import "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" type JSONFileInfo struct { Rows []row.Row diff --git a/go/libraries/doltcore/table/typed/json/reader.go b/go/libraries/doltcore/table/typed/json/reader.go index b378338a16..91641bc0ab 100644 --- a/go/libraries/doltcore/table/typed/json/reader.go +++ b/go/libraries/doltcore/table/typed/json/reader.go @@ -20,11 +20,11 @@ import ( "errors" "io" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema/encoding" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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/filesys" + "github.com/liquidata-inc/dolt/go/store/types" ) var ReadBufSize = 256 * 1024 diff --git a/go/libraries/doltcore/table/typed/json/table_marshaling.go b/go/libraries/doltcore/table/typed/json/table_marshaling.go index 7f0d9881e0..8aaf9dfeaa 100644 --- a/go/libraries/doltcore/table/typed/json/table_marshaling.go +++ b/go/libraries/doltcore/table/typed/json/table_marshaling.go @@ -19,14 +19,14 @@ import ( "encoding/json" "errors" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/filesys" + "github.com/liquidata-inc/dolt/go/libraries/doltcore" + "github.com/liquidata-inc/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/doltdb" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema/encoding" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) type JsonRowData map[string]interface{} diff --git a/go/libraries/doltcore/table/typed/json/writer.go b/go/libraries/doltcore/table/typed/json/writer.go index 247758dd39..5d58f1038f 100644 --- a/go/libraries/doltcore/table/typed/json/writer.go +++ b/go/libraries/doltcore/table/typed/json/writer.go @@ -22,11 +22,11 @@ import ( "io" "path/filepath" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/iohelp" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) 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 9f62e0ac71..8f13870fe3 100644 --- a/go/libraries/doltcore/table/typed/noms/noms_map_creator.go +++ b/go/libraries/doltcore/table/typed/noms/noms_map_creator.go @@ -19,9 +19,9 @@ import ( "errors" "fmt" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) // 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 9d7f72ac98..45dfd30cd9 100644 --- a/go/libraries/doltcore/table/typed/noms/noms_map_updater.go +++ b/go/libraries/doltcore/table/typed/noms/noms_map_updater.go @@ -19,9 +19,9 @@ import ( "errors" "fmt" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) type StatsCB func(stats types.AppliedEditStats) 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 9eeb9c2241..4bbb719950 100644 --- a/go/libraries/doltcore/table/typed/noms/read_write_test.go +++ b/go/libraries/doltcore/table/typed/noms/read_write_test.go @@ -20,11 +20,11 @@ import ( "github.com/google/uuid" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/dbfactory" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) const ( diff --git a/go/libraries/doltcore/table/typed/noms/reader.go b/go/libraries/doltcore/table/typed/noms/reader.go index 7f9073c13a..8ada716175 100644 --- a/go/libraries/doltcore/table/typed/noms/reader.go +++ b/go/libraries/doltcore/table/typed/noms/reader.go @@ -18,10 +18,10 @@ import ( "context" "io" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/pantoerr" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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/pantoerr" + "github.com/liquidata-inc/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/writer.go b/go/libraries/doltcore/table/typed/noms/writer.go index ad4b979819..d7ec7fa957 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/ld/dolt/go/libraries/doltcore/table" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/table" + "github.com/liquidata-inc/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 e4af0054bf..de622ed7bd 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/ld/dolt/go/libraries/doltcore/schema" + "github.com/liquidata-inc/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 722a40bd9d..ea29f23af5 100644 --- a/go/libraries/doltcore/table/untyped/csv/reader.go +++ b/go/libraries/doltcore/table/untyped/csv/reader.go @@ -22,13 +22,13 @@ import ( "io" "strings" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/untyped" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/iohelp" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) // 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 b249e8c13a..03449484f3 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/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/untyped" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) 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 45fec9631c..250d84b286 100644 --- a/go/libraries/doltcore/table/untyped/csv/writer.go +++ b/go/libraries/doltcore/table/untyped/csv/writer.go @@ -22,11 +22,11 @@ import ( "path/filepath" "strings" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/iohelp" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) // 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 100dc9050f..a4d49acdf0 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/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/untyped" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) 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 950d12c4a4..0afbaa28a7 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/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/pipeline" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) // 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 99a371374e..63c04fb1a5 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/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/pipeline" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) 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 ae97213f04..04a115dd9a 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/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/pipeline" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) // 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 e6c4c32956..80a69cd243 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/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" + "github.com/liquidata-inc/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 c6a2973242..efc4be5eb4 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/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/untyped" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/iohelp" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) // 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 0ae110d697..8b5088314a 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/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/untyped" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) 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 70e3495ec3..4e4a8df673 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/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/pipeline" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) const PRINTED_NULL = "" diff --git a/go/libraries/doltcore/table/untyped/resultset/col_with_schema.go b/go/libraries/doltcore/table/untyped/resultset/col_with_schema.go index afcf4c0ecc..80625529f8 100644 --- a/go/libraries/doltcore/table/untyped/resultset/col_with_schema.go +++ b/go/libraries/doltcore/table/untyped/resultset/col_with_schema.go @@ -14,7 +14,7 @@ package resultset -import "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" +import "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" // Container type to package columns with their source schemas. type ColWithSchema struct { diff --git a/go/libraries/doltcore/table/untyped/resultset/result_set.go b/go/libraries/doltcore/table/untyped/resultset/result_set.go index 4f8c00375c..2d1d956a40 100644 --- a/go/libraries/doltcore/table/untyped/resultset/result_set.go +++ b/go/libraries/doltcore/table/untyped/resultset/result_set.go @@ -18,10 +18,10 @@ import ( "errors" "fmt" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/rowconv" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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/store/types" ) // TODO: fix this hot mess diff --git a/go/libraries/doltcore/table/untyped/resultset/result_set_test.go b/go/libraries/doltcore/table/untyped/resultset/result_set_test.go index e63437e0ca..81c209dc01 100644 --- a/go/libraries/doltcore/table/untyped/resultset/result_set_test.go +++ b/go/libraries/doltcore/table/untyped/resultset/result_set_test.go @@ -21,11 +21,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/rowconv" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/untyped" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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/untyped" + "github.com/liquidata-inc/dolt/go/store/types" ) func TestConcatSchemas(t *testing.T) { diff --git a/go/libraries/doltcore/table/untyped/resultset/row_with_schema.go b/go/libraries/doltcore/table/untyped/resultset/row_with_schema.go index 7c3a98ef55..ada7d9580d 100644 --- a/go/libraries/doltcore/table/untyped/resultset/row_with_schema.go +++ b/go/libraries/doltcore/table/untyped/resultset/row_with_schema.go @@ -15,9 +15,9 @@ package resultset import ( - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) // For most analysis, rows can be considered independent of their schema (schemas just provide type / tag number diff --git a/go/libraries/doltcore/table/untyped/resultset/table_result.go b/go/libraries/doltcore/table/untyped/resultset/table_result.go index fb498d63b2..c36fd1e18e 100644 --- a/go/libraries/doltcore/table/untyped/resultset/table_result.go +++ b/go/libraries/doltcore/table/untyped/resultset/table_result.go @@ -17,8 +17,8 @@ package resultset import ( "sync" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/schema" ) // A table result is a set of rows packaged with their schema. Rows are filled in concurrently from a channel. diff --git a/go/libraries/doltcore/table/untyped/sqlexport/sqlwriter.go b/go/libraries/doltcore/table/untyped/sqlexport/sqlwriter.go index a7ba9596d4..8d55f15a86 100644 --- a/go/libraries/doltcore/table/untyped/sqlexport/sqlwriter.go +++ b/go/libraries/doltcore/table/untyped/sqlexport/sqlwriter.go @@ -20,13 +20,13 @@ import ( "path/filepath" "strings" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/sql" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/iohelp" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/libraries/doltcore" + "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" + "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" ) const doubleQuot = "\"" diff --git a/go/libraries/doltcore/table/untyped/sqlexport/sqlwriter_test.go b/go/libraries/doltcore/table/untyped/sqlexport/sqlwriter_test.go index 0183b5dd9d..938639f3db 100644 --- a/go/libraries/doltcore/table/untyped/sqlexport/sqlwriter_test.go +++ b/go/libraries/doltcore/table/untyped/sqlexport/sqlwriter_test.go @@ -22,11 +22,11 @@ import ( "github.com/google/uuid" "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/dtestutils" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/sql" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" + "github.com/liquidata-inc/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 1e8f6d16c9..b6ff8382de 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/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/untyped/fwt" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/iohelp" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) 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 1ec1d631f0..ed40572b9a 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/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/untyped" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) const ( diff --git a/go/libraries/doltcore/table/untyped/untyped_rows.go b/go/libraries/doltcore/table/untyped/untyped_rows.go index 2af35ab0a9..6afdec77b4 100644 --- a/go/libraries/doltcore/table/untyped/untyped_rows.go +++ b/go/libraries/doltcore/table/untyped/untyped_rows.go @@ -15,10 +15,10 @@ package untyped import ( - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/typed" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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/typed" + "github.com/liquidata-inc/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 7e8432e65f..1f23271924 100644 --- a/go/libraries/doltcore/table/untyped/untyped_rows_test.go +++ b/go/libraries/doltcore/table/untyped/untyped_rows_test.go @@ -19,9 +19,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema/encoding" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) func TestNewUntypedSchema(t *testing.T) { diff --git a/go/libraries/doltcore/table/untyped/xlsx/file_info.go b/go/libraries/doltcore/table/untyped/xlsx/file_info.go index dc05533145..30ccbaa881 100644 --- a/go/libraries/doltcore/table/untyped/xlsx/file_info.go +++ b/go/libraries/doltcore/table/untyped/xlsx/file_info.go @@ -14,7 +14,7 @@ package xlsx -import "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" +import "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" type XLSXFileInfo struct { Rows []row.Row diff --git a/go/libraries/doltcore/table/untyped/xlsx/marshaling.go b/go/libraries/doltcore/table/untyped/xlsx/marshaling.go index 8d4d7e9c3b..56d460de1b 100644 --- a/go/libraries/doltcore/table/untyped/xlsx/marshaling.go +++ b/go/libraries/doltcore/table/untyped/xlsx/marshaling.go @@ -20,10 +20,10 @@ import ( "github.com/tealeg/xlsx" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/libraries/doltcore" + "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" ) 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 c52f94a2f5..29ce94aaa1 100644 --- a/go/libraries/doltcore/table/untyped/xlsx/marshaling_test.go +++ b/go/libraries/doltcore/table/untyped/xlsx/marshaling_test.go @@ -19,11 +19,11 @@ import ( "reflect" "testing" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/libraries/doltcore" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/row" + "github.com/liquidata-inc/dolt/go/store/types" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/untyped" + "github.com/liquidata-inc/dolt/go/libraries/doltcore/table/untyped" ) 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 db9afef1f2..af4cec84e0 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/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/table/untyped" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) var ReadBufSize = 256 * 1024 diff --git a/go/libraries/doltcore/table/untyped/xlsx/writer.go b/go/libraries/doltcore/table/untyped/xlsx/writer.go index e82645c6a0..12dd4d1dbd 100644 --- a/go/libraries/doltcore/table/untyped/xlsx/writer.go +++ b/go/libraries/doltcore/table/untyped/xlsx/writer.go @@ -21,11 +21,11 @@ import ( "io" "path/filepath" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/row" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/schema" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/iohelp" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) var WriteBufSize = 256 * 1024 diff --git a/go/libraries/doltcore/type_conversion.go b/go/libraries/doltcore/type_conversion.go index b11f28a455..cc9d68b47e 100644 --- a/go/libraries/doltcore/type_conversion.go +++ b/go/libraries/doltcore/type_conversion.go @@ -18,7 +18,7 @@ import ( "fmt" "strconv" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/store/types" ) type ConversionError struct { diff --git a/go/libraries/doltcore/type_conversion_test.go b/go/libraries/doltcore/type_conversion_test.go index fed5d235ed..d51a9b7b01 100644 --- a/go/libraries/doltcore/type_conversion_test.go +++ b/go/libraries/doltcore/type_conversion_test.go @@ -19,7 +19,7 @@ import ( "github.com/google/uuid" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/store/types" ) const ( diff --git a/go/libraries/utils/argparser/results.go b/go/libraries/utils/argparser/results.go index 8a2ce3866b..4b88e08221 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/ld/dolt/go/libraries/utils/set" + "github.com/liquidata-inc/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 4a72b01c34..eb2b310f7e 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/ld/dolt/go/libraries/utils/filesys" + "github.com/liquidata-inc/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 97856f77e3..90e7d35b58 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/ld/dolt/go/libraries/utils/filesys" + "github.com/liquidata-inc/dolt/go/libraries/utils/filesys" ) const ( diff --git a/go/libraries/utils/earl/url.go b/go/libraries/utils/earl/url.go index 8b7c473f13..b3ac56471e 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/ld/dolt/go/libraries/utils/osutil" + "github.com/liquidata-inc/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 b676e73788..80ba9f6a2c 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/ld/dolt/go/libraries/utils/osutil" + "github.com/liquidata-inc/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 ccb3efc335..603ead5145 100644 --- a/go/libraries/utils/filesys/fs_test.go +++ b/go/libraries/utils/filesys/fs_test.go @@ -21,8 +21,8 @@ import ( "sort" "testing" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/osutil" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/test" + "github.com/liquidata-inc/dolt/go/libraries/utils/osutil" + "github.com/liquidata-inc/dolt/go/libraries/utils/test" ) const ( diff --git a/go/libraries/utils/filesys/inmemfs.go b/go/libraries/utils/filesys/inmemfs.go index 13d2e3dd34..823eab6823 100644 --- a/go/libraries/utils/filesys/inmemfs.go +++ b/go/libraries/utils/filesys/inmemfs.go @@ -23,8 +23,8 @@ import ( "path/filepath" "strings" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/iohelp" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/osutil" + "github.com/liquidata-inc/dolt/go/libraries/utils/iohelp" + "github.com/liquidata-inc/dolt/go/libraries/utils/osutil" ) type memObj interface { diff --git a/go/libraries/utils/iohelp/read_test.go b/go/libraries/utils/iohelp/read_test.go index 031f80dee4..5ed16c6b4c 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/ld/dolt/go/libraries/utils/mathutil" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/osutil" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/test" + "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" ) func TestErrPreservingReader(t *testing.T) { diff --git a/go/libraries/utils/iohelp/write_test.go b/go/libraries/utils/iohelp/write_test.go index 69d04d3dd8..f0698fced8 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/ld/dolt/go/libraries/utils/test" + "github.com/liquidata-inc/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 74031c459b..37537d2db3 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/ld/dolt/go/store/d" +import "github.com/liquidata-inc/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 6a4502efdc..ae17a145f8 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/ld/dolt/go/store/types" + "github.com/liquidata-inc/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 14e2108c66..5d8f2e33a5 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/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/store/types" ) func TestNilSafeEqCheck(t *testing.T) { diff --git a/go/store/chunks/chunk.go b/go/store/chunks/chunk.go index bbbe0dd87d..636722aa73 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/ld/dolt/go/store/d" - "github.com/liquidata-inc/ld/dolt/go/store/hash" + "github.com/liquidata-inc/dolt/go/store/d" + "github.com/liquidata-inc/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 087bc3b462..33238305cf 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/ld/dolt/go/store/d" - "github.com/liquidata-inc/ld/dolt/go/store/hash" + "github.com/liquidata-inc/dolt/go/store/d" + "github.com/liquidata-inc/dolt/go/store/hash" ) /* diff --git a/go/store/chunks/chunk_store.go b/go/store/chunks/chunk_store.go index 735c6a1c8e..827f73bf99 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/ld/dolt/go/store/hash" + "github.com/liquidata-inc/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 28b08f0746..85dac62733 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/ld/dolt/go/store/constants" - "github.com/liquidata-inc/ld/dolt/go/store/hash" + "github.com/liquidata-inc/dolt/go/store/constants" + "github.com/liquidata-inc/dolt/go/store/hash" ) type ChunkStoreTestSuite struct { diff --git a/go/store/chunks/memory_store.go b/go/store/chunks/memory_store.go index 3ff2de1cd0..b971862864 100644 --- a/go/store/chunks/memory_store.go +++ b/go/store/chunks/memory_store.go @@ -25,9 +25,9 @@ import ( "context" "sync" - "github.com/liquidata-inc/ld/dolt/go/store/constants" - "github.com/liquidata-inc/ld/dolt/go/store/d" - "github.com/liquidata-inc/ld/dolt/go/store/hash" + "github.com/liquidata-inc/dolt/go/store/constants" + "github.com/liquidata-inc/dolt/go/store/d" + "github.com/liquidata-inc/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 c408c86192..78e5b1d651 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/ld/dolt/go/store/hash" + "github.com/liquidata-inc/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 0d7f960933..520b6787c0 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/ld/dolt/go/store/hash" + "github.com/liquidata-inc/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 8344e230e8..5ee826ba30 100644 --- a/go/store/chunks/test_utils.go +++ b/go/store/chunks/test_utils.go @@ -26,8 +26,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/ld/dolt/go/store/d" - "github.com/liquidata-inc/ld/dolt/go/store/hash" + "github.com/liquidata-inc/dolt/go/store/d" + "github.com/liquidata-inc/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 98ed498d31..5ea5ae40d0 100644 --- a/go/store/cmd/noms/commit_iterator.go +++ b/go/store/cmd/noms/commit_iterator.go @@ -25,8 +25,8 @@ import ( "context" "fmt" - "github.com/liquidata-inc/ld/dolt/go/store/datas" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/store/datas" + "github.com/liquidata-inc/dolt/go/store/types" ) type CommitIterator struct { diff --git a/go/store/cmd/noms/noms.go b/go/store/cmd/noms/noms.go index 106a2a4ae1..24fc51ea7e 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/ld/dolt/go/store/cmd/noms/util" - "github.com/liquidata-inc/ld/dolt/go/store/util/exit" - "github.com/liquidata-inc/ld/dolt/go/store/util/profile" - "github.com/liquidata-inc/ld/dolt/go/store/util/verbose" + "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" ) var commands = []*util.Command{ diff --git a/go/store/cmd/noms/noms_blob.go b/go/store/cmd/noms/noms_blob.go index 4c4a6b5724..d6629d02c9 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/ld/dolt/go/store/cmd/noms/util" - "github.com/liquidata-inc/ld/dolt/go/store/d" + "github.com/liquidata-inc/dolt/go/store/cmd/noms/util" + "github.com/liquidata-inc/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 b23a5a1160..c11472aacf 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/ld/dolt/go/store/cmd/noms/util" - "github.com/liquidata-inc/ld/dolt/go/store/config" - "github.com/liquidata-inc/ld/dolt/go/store/types" - "github.com/liquidata-inc/ld/dolt/go/store/util/profile" - "github.com/liquidata-inc/ld/dolt/go/store/util/progressreader" - "github.com/liquidata-inc/ld/dolt/go/store/util/status" + "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" ) 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 e779869020..be235b4c0f 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/ld/dolt/go/store/spec" - "github.com/liquidata-inc/ld/dolt/go/store/types" - "github.com/liquidata-inc/ld/dolt/go/store/util/clienttest" + "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" ) 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 26754addd7..042df0999e 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/ld/dolt/go/store/cmd/noms/util" + "github.com/liquidata-inc/dolt/go/store/cmd/noms/util" - "github.com/liquidata-inc/ld/dolt/go/store/config" - "github.com/liquidata-inc/ld/dolt/go/store/types" - "github.com/liquidata-inc/ld/dolt/go/store/util/profile" + "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" ) 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 d99f06a3fe..8d334d828d 100644 --- a/go/store/cmd/noms/noms_cat.go +++ b/go/store/cmd/noms/noms_cat.go @@ -30,10 +30,10 @@ import ( "github.com/golang/snappy" flag "github.com/juju/gnuflag" - "github.com/liquidata-inc/ld/dolt/go/store/chunks" - "github.com/liquidata-inc/ld/dolt/go/store/cmd/noms/util" - "github.com/liquidata-inc/ld/dolt/go/store/spec" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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/spec" + "github.com/liquidata-inc/dolt/go/store/types" ) const ( diff --git a/go/store/cmd/noms/noms_commit.go b/go/store/cmd/noms/noms_commit.go index 7e99c397b3..3899ef5bc7 100644 --- a/go/store/cmd/noms/noms_commit.go +++ b/go/store/cmd/noms/noms_commit.go @@ -30,11 +30,11 @@ import ( flag "github.com/juju/gnuflag" - "github.com/liquidata-inc/ld/dolt/go/store/cmd/noms/util" - "github.com/liquidata-inc/ld/dolt/go/store/config" - "github.com/liquidata-inc/ld/dolt/go/store/datas" - "github.com/liquidata-inc/ld/dolt/go/store/spec" - "github.com/liquidata-inc/ld/dolt/go/store/util/verbose" + "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/spec" + "github.com/liquidata-inc/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 d402501009..0013ae697b 100644 --- a/go/store/cmd/noms/noms_commit_test.go +++ b/go/store/cmd/noms/noms_commit_test.go @@ -28,10 +28,10 @@ import ( "github.com/stretchr/testify/suite" - "github.com/liquidata-inc/ld/dolt/go/store/datas" - "github.com/liquidata-inc/ld/dolt/go/store/spec" - "github.com/liquidata-inc/ld/dolt/go/store/types" - "github.com/liquidata-inc/ld/dolt/go/store/util/clienttest" + "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" ) type nomsCommitTestSuite struct { diff --git a/go/store/cmd/noms/noms_config.go b/go/store/cmd/noms/noms_config.go index 00eec801b4..571a382239 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/ld/dolt/go/store/cmd/noms/util" - "github.com/liquidata-inc/ld/dolt/go/store/config" + "github.com/liquidata-inc/dolt/go/store/cmd/noms/util" + "github.com/liquidata-inc/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 f956fed86b..40db48dbfe 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/ld/dolt/go/store/cmd/noms/util" - "github.com/liquidata-inc/ld/dolt/go/store/config" - "github.com/liquidata-inc/ld/dolt/go/store/d" - "github.com/liquidata-inc/ld/dolt/go/store/diff" - "github.com/liquidata-inc/ld/dolt/go/store/util/outputpager" - "github.com/liquidata-inc/ld/dolt/go/store/util/verbose" + "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" ) var stat bool diff --git a/go/store/cmd/noms/noms_diff_test.go b/go/store/cmd/noms/noms_diff_test.go index c508527317..4c95e6cd39 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/ld/dolt/go/store/spec" - "github.com/liquidata-inc/ld/dolt/go/store/types" - "github.com/liquidata-inc/ld/dolt/go/store/util/clienttest" + "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" ) type nomsDiffTestSuite struct { diff --git a/go/store/cmd/noms/noms_ds.go b/go/store/cmd/noms/noms_ds.go index 94ae60c46a..e5dee32608 100644 --- a/go/store/cmd/noms/noms_ds.go +++ b/go/store/cmd/noms/noms_ds.go @@ -28,10 +28,10 @@ import ( flag "github.com/juju/gnuflag" - "github.com/liquidata-inc/ld/dolt/go/store/cmd/noms/util" - "github.com/liquidata-inc/ld/dolt/go/store/config" - "github.com/liquidata-inc/ld/dolt/go/store/types" - "github.com/liquidata-inc/ld/dolt/go/store/util/verbose" + "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/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 8e8ca1ad11..1620ae8e0e 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/ld/dolt/go/store/datas" - "github.com/liquidata-inc/ld/dolt/go/store/nbs" - "github.com/liquidata-inc/ld/dolt/go/store/spec" - "github.com/liquidata-inc/ld/dolt/go/store/types" - "github.com/liquidata-inc/ld/dolt/go/store/util/clienttest" + "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" ) func TestDs(t *testing.T) { diff --git a/go/store/cmd/noms/noms_list.go b/go/store/cmd/noms/noms_list.go index ccdea9c9b3..f060eef68f 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/ld/dolt/go/store/cmd/noms/util" - "github.com/liquidata-inc/ld/dolt/go/store/d" - "github.com/liquidata-inc/ld/dolt/go/store/datas" - "github.com/liquidata-inc/ld/dolt/go/store/diff" - "github.com/liquidata-inc/ld/dolt/go/store/spec" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) 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 f43fc599f3..c79125fba4 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/ld/dolt/go/store/cmd/noms/util" - "github.com/liquidata-inc/ld/dolt/go/store/config" - "github.com/liquidata-inc/ld/dolt/go/store/d" - "github.com/liquidata-inc/ld/dolt/go/store/datas" - "github.com/liquidata-inc/ld/dolt/go/store/diff" - "github.com/liquidata-inc/ld/dolt/go/store/spec" - "github.com/liquidata-inc/ld/dolt/go/store/types" - "github.com/liquidata-inc/ld/dolt/go/store/util/datetime" - "github.com/liquidata-inc/ld/dolt/go/store/util/functions" - "github.com/liquidata-inc/ld/dolt/go/store/util/outputpager" - "github.com/liquidata-inc/ld/dolt/go/store/util/verbose" - "github.com/liquidata-inc/ld/dolt/go/store/util/writers" + "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" ) var ( diff --git a/go/store/cmd/noms/noms_log_test.go b/go/store/cmd/noms/noms_log_test.go index 1dde8765f5..448ff732f5 100644 --- a/go/store/cmd/noms/noms_log_test.go +++ b/go/store/cmd/noms/noms_log_test.go @@ -28,11 +28,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" - "github.com/liquidata-inc/ld/dolt/go/store/datas" - "github.com/liquidata-inc/ld/dolt/go/store/spec" - "github.com/liquidata-inc/ld/dolt/go/store/types" - "github.com/liquidata-inc/ld/dolt/go/store/util/clienttest" - "github.com/liquidata-inc/ld/dolt/go/store/util/test" + "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" ) func TestNomsLog(t *testing.T) { diff --git a/go/store/cmd/noms/noms_manifest.go b/go/store/cmd/noms/noms_manifest.go index 0204cbc740..1a74bd4ce0 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/ld/dolt/go/store/cmd/noms/util" - "github.com/liquidata-inc/ld/dolt/go/store/d" - "github.com/liquidata-inc/ld/dolt/go/store/nbs" - "github.com/liquidata-inc/ld/dolt/go/store/spec" + "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" ) var nomsManifest = &util.Command{ diff --git a/go/store/cmd/noms/noms_map.go b/go/store/cmd/noms/noms_map.go index 3a94fcde80..4d0aec910b 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/ld/dolt/go/store/cmd/noms/util" - "github.com/liquidata-inc/ld/dolt/go/store/d" - "github.com/liquidata-inc/ld/dolt/go/store/datas" - "github.com/liquidata-inc/ld/dolt/go/store/diff" - "github.com/liquidata-inc/ld/dolt/go/store/spec" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) 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 ea020245ef..e753186ca3 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/ld/dolt/go/store/cmd/noms/util" - "github.com/liquidata-inc/ld/dolt/go/store/config" - "github.com/liquidata-inc/ld/dolt/go/store/d" - "github.com/liquidata-inc/ld/dolt/go/store/datas" - "github.com/liquidata-inc/ld/dolt/go/store/merge" - "github.com/liquidata-inc/ld/dolt/go/store/types" - "github.com/liquidata-inc/ld/dolt/go/store/util/status" - "github.com/liquidata-inc/ld/dolt/go/store/util/verbose" + "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" ) var ( diff --git a/go/store/cmd/noms/noms_merge_test.go b/go/store/cmd/noms/noms_merge_test.go index e1800f780c..bc0bf974ba 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/ld/dolt/go/libraries/utils/osutil" - "github.com/liquidata-inc/ld/dolt/go/store/datas" - "github.com/liquidata-inc/ld/dolt/go/store/spec" - "github.com/liquidata-inc/ld/dolt/go/store/types" - "github.com/liquidata-inc/ld/dolt/go/store/util/clienttest" + "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" ) type nomsMergeTestSuite struct { diff --git a/go/store/cmd/noms/noms_root.go b/go/store/cmd/noms/noms_root.go index 1c9cbd1d4a..ed58630eef 100644 --- a/go/store/cmd/noms/noms_root.go +++ b/go/store/cmd/noms/noms_root.go @@ -29,11 +29,11 @@ import ( flag "github.com/juju/gnuflag" - "github.com/liquidata-inc/ld/dolt/go/store/cmd/noms/util" - "github.com/liquidata-inc/ld/dolt/go/store/config" - "github.com/liquidata-inc/ld/dolt/go/store/datas" - "github.com/liquidata-inc/ld/dolt/go/store/hash" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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/hash" + "github.com/liquidata-inc/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 da14f8817b..f21d46328d 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/ld/dolt/go/store/spec" - "github.com/liquidata-inc/ld/dolt/go/store/types" - "github.com/liquidata-inc/ld/dolt/go/store/util/clienttest" + "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" ) func TestNomsRoot(t *testing.T) { diff --git a/go/store/cmd/noms/noms_set.go b/go/store/cmd/noms/noms_set.go index cee7b9d1dc..7887a872b3 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/ld/dolt/go/store/cmd/noms/util" - "github.com/liquidata-inc/ld/dolt/go/store/d" - "github.com/liquidata-inc/ld/dolt/go/store/datas" - "github.com/liquidata-inc/ld/dolt/go/store/diff" - "github.com/liquidata-inc/ld/dolt/go/store/spec" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) 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 ea049fa948..1b8bd8bc97 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/ld/dolt/go/store/cmd/noms/util" - "github.com/liquidata-inc/ld/dolt/go/store/config" - "github.com/liquidata-inc/ld/dolt/go/store/types" - "github.com/liquidata-inc/ld/dolt/go/store/util/datetime" - "github.com/liquidata-inc/ld/dolt/go/store/util/outputpager" - "github.com/liquidata-inc/ld/dolt/go/store/util/verbose" + "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" ) 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 7cb634d723..80ed1233bf 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/ld/dolt/go/store/chunks" - "github.com/liquidata-inc/ld/dolt/go/store/spec" - "github.com/liquidata-inc/ld/dolt/go/store/types" - "github.com/liquidata-inc/ld/dolt/go/store/util/clienttest" - "github.com/liquidata-inc/ld/dolt/go/store/util/test" + "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" ) func TestNomsShow(t *testing.T) { diff --git a/go/store/cmd/noms/noms_stats.go b/go/store/cmd/noms/noms_stats.go index f92f009e36..40d9ffd72d 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/ld/dolt/go/store/cmd/noms/util" - "github.com/liquidata-inc/ld/dolt/go/store/config" + "github.com/liquidata-inc/dolt/go/store/cmd/noms/util" + "github.com/liquidata-inc/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 7baa9e3313..1435a05bd9 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/ld/dolt/go/store/cmd/noms/util" - "github.com/liquidata-inc/ld/dolt/go/store/d" - "github.com/liquidata-inc/ld/dolt/go/store/datas" - "github.com/liquidata-inc/ld/dolt/go/store/diff" - "github.com/liquidata-inc/ld/dolt/go/store/spec" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) 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 725e902f23..efc603c953 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/ld/dolt/go/store/cmd/noms/util" - "github.com/liquidata-inc/ld/dolt/go/store/config" - "github.com/liquidata-inc/ld/dolt/go/store/datas" - "github.com/liquidata-inc/ld/dolt/go/store/types" - "github.com/liquidata-inc/ld/dolt/go/store/util/profile" - "github.com/liquidata-inc/ld/dolt/go/store/util/status" - "github.com/liquidata-inc/ld/dolt/go/store/util/verbose" + "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" ) var ( diff --git a/go/store/cmd/noms/noms_sync_test.go b/go/store/cmd/noms/noms_sync_test.go index b6cd9e05e8..df92094efc 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/ld/dolt/go/store/datas" - "github.com/liquidata-inc/ld/dolt/go/store/nbs" - "github.com/liquidata-inc/ld/dolt/go/store/spec" - "github.com/liquidata-inc/ld/dolt/go/store/types" - "github.com/liquidata-inc/ld/dolt/go/store/util/clienttest" + "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" ) func TestSync(t *testing.T) { diff --git a/go/store/cmd/noms/noms_version.go b/go/store/cmd/noms/noms_version.go index 42580ecc78..5c872b7efa 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/ld/dolt/go/store/cmd/noms/util" - "github.com/liquidata-inc/ld/dolt/go/store/constants" + "github.com/liquidata-inc/dolt/go/store/cmd/noms/util" + "github.com/liquidata-inc/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 9859060952..18e83d9ef8 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/ld/dolt/go/store/constants" - "github.com/liquidata-inc/ld/dolt/go/store/util/clienttest" + "github.com/liquidata-inc/dolt/go/store/constants" + "github.com/liquidata-inc/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 2b29e29a6a..820f52e930 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/ld/dolt/go/store/util/exit" + "github.com/liquidata-inc/dolt/go/store/util/exit" ) func CheckError(err error) { diff --git a/go/store/config/config.go b/go/store/config/config.go index d16ca01ad9..cc06c8fa7f 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/ld/dolt/go/store/spec" + "github.com/liquidata-inc/dolt/go/store/spec" ) // All configuration diff --git a/go/store/config/config_test.go b/go/store/config/config_test.go index c7e6966c49..f260295332 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/ld/dolt/go/libraries/utils/osutil" - "github.com/liquidata-inc/ld/dolt/go/store/spec" + "github.com/liquidata-inc/dolt/go/libraries/utils/osutil" + "github.com/liquidata-inc/dolt/go/store/spec" ) const ( diff --git a/go/store/config/resolver.go b/go/store/config/resolver.go index f06ed51e8b..a7e254e78e 100644 --- a/go/store/config/resolver.go +++ b/go/store/config/resolver.go @@ -26,11 +26,11 @@ import ( "fmt" "strings" - "github.com/liquidata-inc/ld/dolt/go/store/chunks" - "github.com/liquidata-inc/ld/dolt/go/store/datas" - "github.com/liquidata-inc/ld/dolt/go/store/spec" - "github.com/liquidata-inc/ld/dolt/go/store/types" - "github.com/liquidata-inc/ld/dolt/go/store/util/verbose" + "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" ) type Resolver struct { diff --git a/go/store/config/resolver_test.go b/go/store/config/resolver_test.go index 62f92f721b..58e957bcab 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/ld/dolt/go/libraries/utils/osutil" - "github.com/liquidata-inc/ld/dolt/go/store/spec" + "github.com/liquidata-inc/dolt/go/libraries/utils/osutil" + "github.com/liquidata-inc/dolt/go/store/spec" ) const ( diff --git a/go/store/datas/commit.go b/go/store/datas/commit.go index 3ca743f353..471e7f9d65 100644 --- a/go/store/datas/commit.go +++ b/go/store/datas/commit.go @@ -25,10 +25,10 @@ import ( "context" "sort" - "github.com/liquidata-inc/ld/dolt/go/store/d" - "github.com/liquidata-inc/ld/dolt/go/store/hash" - "github.com/liquidata-inc/ld/dolt/go/store/nomdl" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) const ( diff --git a/go/store/datas/commit_options.go b/go/store/datas/commit_options.go index 7c568f04ac..8edc7e7eb7 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/ld/dolt/go/store/merge" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/store/merge" + "github.com/liquidata-inc/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 78a702d01a..d6852281f6 100644 --- a/go/store/datas/commit_test.go +++ b/go/store/datas/commit_test.go @@ -27,9 +27,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/ld/dolt/go/store/chunks" - "github.com/liquidata-inc/ld/dolt/go/store/nomdl" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/store/chunks" + "github.com/liquidata-inc/dolt/go/store/nomdl" + "github.com/liquidata-inc/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 9b9d16aace..d10adec920 100644 --- a/go/store/datas/database.go +++ b/go/store/datas/database.go @@ -26,8 +26,8 @@ import ( "context" "io" - "github.com/liquidata-inc/ld/dolt/go/store/chunks" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/store/chunks" + "github.com/liquidata-inc/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 3485829170..d3efe60bcc 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/ld/dolt/go/store/chunks" - "github.com/liquidata-inc/ld/dolt/go/store/d" - "github.com/liquidata-inc/ld/dolt/go/store/hash" - "github.com/liquidata-inc/ld/dolt/go/store/merge" - "github.com/liquidata-inc/ld/dolt/go/store/types" - "github.com/liquidata-inc/ld/dolt/go/store/util/random" + "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" ) type database struct { diff --git a/go/store/datas/database_test.go b/go/store/datas/database_test.go index a607e9f8cc..0ce601fc98 100644 --- a/go/store/datas/database_test.go +++ b/go/store/datas/database_test.go @@ -28,11 +28,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" - "github.com/liquidata-inc/ld/dolt/go/store/chunks" - "github.com/liquidata-inc/ld/dolt/go/store/d" - "github.com/liquidata-inc/ld/dolt/go/store/hash" - "github.com/liquidata-inc/ld/dolt/go/store/merge" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) func TestLocalDatabase(t *testing.T) { diff --git a/go/store/datas/dataset.go b/go/store/datas/dataset.go index 0a3ccf6242..8912e0f605 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/ld/dolt/go/store/d" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/store/d" + "github.com/liquidata-inc/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 c80f1bc63c..e5d408189e 100644 --- a/go/store/datas/dataset_test.go +++ b/go/store/datas/dataset_test.go @@ -27,8 +27,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/ld/dolt/go/store/chunks" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/store/chunks" + "github.com/liquidata-inc/dolt/go/store/types" ) func TestExplicitBranchUsingDatasets(t *testing.T) { diff --git a/go/store/datas/pull.go b/go/store/datas/pull.go index 2ca47b0c86..6f806b7f80 100644 --- a/go/store/datas/pull.go +++ b/go/store/datas/pull.go @@ -30,10 +30,10 @@ import ( "github.com/golang/snappy" - "github.com/liquidata-inc/ld/dolt/go/store/chunks" - "github.com/liquidata-inc/ld/dolt/go/store/hash" - "github.com/liquidata-inc/ld/dolt/go/store/nbs" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) type PullProgress struct { diff --git a/go/store/datas/pull_test.go b/go/store/datas/pull_test.go index af84b7dd60..78af6f1673 100644 --- a/go/store/datas/pull_test.go +++ b/go/store/datas/pull_test.go @@ -27,8 +27,8 @@ import ( "github.com/stretchr/testify/suite" - "github.com/liquidata-inc/ld/dolt/go/store/chunks" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/store/chunks" + "github.com/liquidata-inc/dolt/go/store/types" ) const datasetID = "ds1" diff --git a/go/store/datas/serialize_hashes.go b/go/store/datas/serialize_hashes.go index 8a3c89dbd8..285c876f08 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/ld/dolt/go/store/chunks" - "github.com/liquidata-inc/ld/dolt/go/store/hash" + "github.com/liquidata-inc/dolt/go/store/chunks" + "github.com/liquidata-inc/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 954c02b24c..d1e8b6f9b2 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/ld/dolt/go/store/chunks" - "github.com/liquidata-inc/ld/dolt/go/store/hash" + "github.com/liquidata-inc/dolt/go/store/chunks" + "github.com/liquidata-inc/dolt/go/store/hash" ) func TestHashRoundTrip(t *testing.T) { diff --git a/go/store/diff/apply_patch.go b/go/store/diff/apply_patch.go index db28126db8..2e97fe8098 100644 --- a/go/store/diff/apply_patch.go +++ b/go/store/diff/apply_patch.go @@ -26,8 +26,8 @@ import ( "fmt" "sort" - "github.com/liquidata-inc/ld/dolt/go/store/d" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/store/d" + "github.com/liquidata-inc/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 3bff215588..727aab03bf 100644 --- a/go/store/diff/apply_patch_test.go +++ b/go/store/diff/apply_patch_test.go @@ -27,10 +27,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/ld/dolt/go/store/chunks" - "github.com/liquidata-inc/ld/dolt/go/store/d" - "github.com/liquidata-inc/ld/dolt/go/store/marshal" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) func TestCommonPrefixCount(t *testing.T) { diff --git a/go/store/diff/diff.go b/go/store/diff/diff.go index a75f0b655d..9b3d8dcdc3 100644 --- a/go/store/diff/diff.go +++ b/go/store/diff/diff.go @@ -25,7 +25,7 @@ import ( "context" "sync/atomic" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/store/types" ) type ( diff --git a/go/store/diff/diff_test.go b/go/store/diff/diff_test.go index 1c774351c0..9a428fc479 100644 --- a/go/store/diff/diff_test.go +++ b/go/store/diff/diff_test.go @@ -30,9 +30,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/ld/dolt/go/store/types" - "github.com/liquidata-inc/ld/dolt/go/store/util/test" - "github.com/liquidata-inc/ld/dolt/go/store/util/writers" + "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" ) var ( diff --git a/go/store/diff/patch.go b/go/store/diff/patch.go index 2cc85a5c20..1e5709c785 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/ld/dolt/go/store/types" + "github.com/liquidata-inc/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 9c9ffc31c3..47cfe907ba 100644 --- a/go/store/diff/patch_test.go +++ b/go/store/diff/patch_test.go @@ -28,7 +28,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/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 7edad98fc3..ce7f0b56b6 100644 --- a/go/store/diff/print_diff.go +++ b/go/store/diff/print_diff.go @@ -27,8 +27,8 @@ import ( "github.com/dustin/go-humanize" - "github.com/liquidata-inc/ld/dolt/go/store/types" - "github.com/liquidata-inc/ld/dolt/go/store/util/writers" + "github.com/liquidata-inc/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/store/util/writers" ) type prefixOp string diff --git a/go/store/diff/summary.go b/go/store/diff/summary.go index ec67ee58cb..774a5098b5 100644 --- a/go/store/diff/summary.go +++ b/go/store/diff/summary.go @@ -28,9 +28,9 @@ import ( humanize "github.com/dustin/go-humanize" - "github.com/liquidata-inc/ld/dolt/go/store/datas" - "github.com/liquidata-inc/ld/dolt/go/store/types" - "github.com/liquidata-inc/ld/dolt/go/store/util/status" + "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" ) // 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 7061c06581..0ca8fcbf60 100644 --- a/go/store/hash/hash.go +++ b/go/store/hash/hash.go @@ -52,7 +52,7 @@ import ( "regexp" "strconv" - "github.com/liquidata-inc/ld/dolt/go/store/d" + "github.com/liquidata-inc/dolt/go/store/d" ) const ( diff --git a/go/store/marshal/decode.go b/go/store/marshal/decode.go index 34bc6e5535..e67135af76 100644 --- a/go/store/marshal/decode.go +++ b/go/store/marshal/decode.go @@ -27,7 +27,7 @@ import ( "reflect" "sync" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/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 2a9dc2d267..ebe278e7c1 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/ld/dolt/go/store/chunks" - "github.com/liquidata-inc/ld/dolt/go/store/d" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/store/chunks" + "github.com/liquidata-inc/dolt/go/store/d" + "github.com/liquidata-inc/dolt/go/store/types" ) func TestDecode(tt *testing.T) { diff --git a/go/store/marshal/encode.go b/go/store/marshal/encode.go index 29805f58b7..9a2bbf59ef 100644 --- a/go/store/marshal/encode.go +++ b/go/store/marshal/encode.go @@ -32,7 +32,7 @@ import ( "strings" "sync" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/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 683f864b22..edcda1b1ed 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/ld/dolt/go/store/types" + "github.com/liquidata-inc/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 2c87ae2b8c..6b90e03f2c 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/ld/dolt/go/store/types" + "github.com/liquidata-inc/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 e4d3a501d2..84879da15d 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/ld/dolt/go/store/nomdl" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/store/nomdl" + "github.com/liquidata-inc/dolt/go/store/types" ) func TestMarshalTypeType(tt *testing.T) { diff --git a/go/store/merge/candidate.go b/go/store/merge/candidate.go index 929fbc460a..cafc20b91a 100644 --- a/go/store/merge/candidate.go +++ b/go/store/merge/candidate.go @@ -25,8 +25,8 @@ import ( "context" "fmt" - "github.com/liquidata-inc/ld/dolt/go/store/d" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/store/d" + "github.com/liquidata-inc/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 3ce587d087..680a74c5d4 100644 --- a/go/store/merge/three_way.go +++ b/go/store/merge/three_way.go @@ -25,8 +25,8 @@ import ( "context" "fmt" - "github.com/liquidata-inc/ld/dolt/go/store/d" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/store/d" + "github.com/liquidata-inc/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 7bc1a068af..e0ce7d3bea 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/ld/dolt/go/store/types" + "github.com/liquidata-inc/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 204dac7b60..b6f3c05255 100644 --- a/go/store/merge/three_way_list.go +++ b/go/store/merge/three_way_list.go @@ -25,8 +25,8 @@ import ( "context" "fmt" - "github.com/liquidata-inc/ld/dolt/go/store/d" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/store/d" + "github.com/liquidata-inc/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 39e752281a..83555c69ba 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/ld/dolt/go/store/types" + "github.com/liquidata-inc/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 c1208ecba8..decf97c83e 100644 --- a/go/store/merge/three_way_ordered_sequence.go +++ b/go/store/merge/three_way_ordered_sequence.go @@ -25,8 +25,8 @@ import ( "context" "fmt" - "github.com/liquidata-inc/ld/dolt/go/store/d" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/store/d" + "github.com/liquidata-inc/dolt/go/store/types" ) type applyFunc func(candidate, types.ValueChanged, types.Value) candidate diff --git a/go/store/merge/three_way_set_test.go b/go/store/merge/three_way_set_test.go index 6dd265e8e4..997858e2ed 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/ld/dolt/go/store/types" + "github.com/liquidata-inc/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 e53be679ab..a9f0d13c8c 100644 --- a/go/store/merge/three_way_test.go +++ b/go/store/merge/three_way_test.go @@ -28,8 +28,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" - "github.com/liquidata-inc/ld/dolt/go/store/chunks" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/store/chunks" + "github.com/liquidata-inc/dolt/go/store/types" ) type seq interface { diff --git a/go/store/metrics/histogram.go b/go/store/metrics/histogram.go index 1f94f06d58..7df67c8ab8 100644 --- a/go/store/metrics/histogram.go +++ b/go/store/metrics/histogram.go @@ -28,7 +28,7 @@ import ( humanize "github.com/dustin/go-humanize" - "github.com/liquidata-inc/ld/dolt/go/store/d" + "github.com/liquidata-inc/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 a49dd9f730..74e8cc4d59 100644 --- a/go/store/nbs/aws_table_persister.go +++ b/go/store/nbs/aws_table_persister.go @@ -34,7 +34,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/s3" - "github.com/liquidata-inc/ld/dolt/go/store/util/verbose" + "github.com/liquidata-inc/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 4f824dced7..207ec87d37 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/ld/dolt/go/store/util/sizecache" + "github.com/liquidata-inc/dolt/go/store/util/sizecache" ) func TestAWSTablePersisterPersist(t *testing.T) { diff --git a/go/store/nbs/benchmarks/block_store_benchmarks.go b/go/store/nbs/benchmarks/block_store_benchmarks.go index b0b22bf9f0..fde29d3a69 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/ld/dolt/go/store/chunks" - "github.com/liquidata-inc/ld/dolt/go/store/d" - "github.com/liquidata-inc/ld/dolt/go/store/hash" + "github.com/liquidata-inc/dolt/go/store/chunks" + "github.com/liquidata-inc/dolt/go/store/d" + "github.com/liquidata-inc/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 d50558c3a6..b4c86b1dd7 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/ld/dolt/go/store/d" - "github.com/liquidata-inc/ld/dolt/go/store/nbs/benchmarks/gen" + "github.com/liquidata-inc/dolt/go/store/d" + "github.com/liquidata-inc/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 424013c14b..04e814fa18 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/ld/dolt/go/store/chunks" - "github.com/liquidata-inc/ld/dolt/go/store/hash" - "github.com/liquidata-inc/ld/dolt/go/store/nbs" - "github.com/liquidata-inc/ld/dolt/go/store/nbs/benchmarks/gen" + "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/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 276a7f7fe8..f857b2d44b 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/ld/dolt/go/store/chunks" - "github.com/liquidata-inc/ld/dolt/go/store/hash" + "github.com/liquidata-inc/dolt/go/store/chunks" + "github.com/liquidata-inc/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 1eb47f3304..c36a2b15ca 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/ld/dolt/go/store/d" - "github.com/liquidata-inc/ld/dolt/go/store/hash" + "github.com/liquidata-inc/dolt/go/store/d" + "github.com/liquidata-inc/dolt/go/store/hash" ) const ( diff --git a/go/store/nbs/benchmarks/main.go b/go/store/nbs/benchmarks/main.go index 96b9b819b7..36d212b060 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/ld/dolt/go/store/chunks" - "github.com/liquidata-inc/ld/dolt/go/store/d" - "github.com/liquidata-inc/ld/dolt/go/store/nbs" - "github.com/liquidata-inc/ld/dolt/go/store/types" - "github.com/liquidata-inc/ld/dolt/go/store/util/profile" + "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" ) var ( diff --git a/go/store/nbs/benchmarks/null_block_store.go b/go/store/nbs/benchmarks/null_block_store.go index 81207b23fe..3babe3891a 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/ld/dolt/go/store/chunks" - "github.com/liquidata-inc/ld/dolt/go/store/hash" + "github.com/liquidata-inc/dolt/go/store/chunks" + "github.com/liquidata-inc/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 0bd973a342..fe7f0e53f8 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/ld/dolt/go/libraries/utils/osutil" - "github.com/liquidata-inc/ld/dolt/go/store/chunks" - "github.com/liquidata-inc/ld/dolt/go/store/constants" - "github.com/liquidata-inc/ld/dolt/go/store/d" - "github.com/liquidata-inc/ld/dolt/go/store/hash" + "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" ) const testMemTableSize = 1 << 8 diff --git a/go/store/nbs/bs_manifest.go b/go/store/nbs/bs_manifest.go index 1cd10d28a5..fefd1fc9b7 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/ld/dolt/go/store/blobstore" + "github.com/liquidata-inc/dolt/go/store/blobstore" ) const ( diff --git a/go/store/nbs/bs_persister.go b/go/store/nbs/bs_persister.go index 3d10a6cae2..a2a1a76b64 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/ld/dolt/go/store/blobstore" + "github.com/liquidata-inc/dolt/go/store/blobstore" ) type blobstorePersister struct { diff --git a/go/store/nbs/cache.go b/go/store/nbs/cache.go index 9fb3d016a2..550b670b87 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/ld/dolt/go/store/chunks" - "github.com/liquidata-inc/ld/dolt/go/store/hash" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/store/chunks" + "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/liquidata-inc/dolt/go/store/types" ) const ( diff --git a/go/store/nbs/conjoiner_test.go b/go/store/nbs/conjoiner_test.go index 0ad64ee57b..876247f426 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/ld/dolt/go/store/constants" - "github.com/liquidata-inc/ld/dolt/go/store/hash" + "github.com/liquidata-inc/dolt/go/store/constants" + "github.com/liquidata-inc/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 a97521d97c..38334e972f 100644 --- a/go/store/nbs/dynamo_fake_test.go +++ b/go/store/nbs/dynamo_fake_test.go @@ -30,7 +30,7 @@ import ( "github.com/aws/aws-sdk-go/service/dynamodb" "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/ld/dolt/go/store/constants" + "github.com/liquidata-inc/dolt/go/store/constants" ) type fakeDDB struct { diff --git a/go/store/nbs/dynamo_manifest.go b/go/store/nbs/dynamo_manifest.go index cd2dd9351c..16159d9ff0 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/ld/dolt/go/store/d" - "github.com/liquidata-inc/ld/dolt/go/store/hash" + "github.com/liquidata-inc/dolt/go/store/d" + "github.com/liquidata-inc/dolt/go/store/hash" ) const ( diff --git a/go/store/nbs/dynamo_manifest_test.go b/go/store/nbs/dynamo_manifest_test.go index 9a747f1ed6..59c65c5963 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/ld/dolt/go/store/constants" - "github.com/liquidata-inc/ld/dolt/go/store/hash" + "github.com/liquidata-inc/dolt/go/store/constants" + "github.com/liquidata-inc/dolt/go/store/hash" ) const ( diff --git a/go/store/nbs/dynamo_table_reader.go b/go/store/nbs/dynamo_table_reader.go index 19d7636602..75f91eb768 100644 --- a/go/store/nbs/dynamo_table_reader.go +++ b/go/store/nbs/dynamo_table_reader.go @@ -31,7 +31,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/dynamodb" - "github.com/liquidata-inc/ld/dolt/go/store/util/sizecache" + "github.com/liquidata-inc/dolt/go/store/util/sizecache" ) const ( diff --git a/go/store/nbs/dynamo_table_reader_test.go b/go/store/nbs/dynamo_table_reader_test.go index 5ad640fb20..3d4d9d6b3d 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/ld/dolt/go/store/util/sizecache" + "github.com/liquidata-inc/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 7b4f8762eb..46b5d5b3ea 100644 --- a/go/store/nbs/file_manifest.go +++ b/go/store/nbs/file_manifest.go @@ -33,7 +33,7 @@ import ( "github.com/juju/fslock" - "github.com/liquidata-inc/ld/dolt/go/store/hash" + "github.com/liquidata-inc/dolt/go/store/hash" ) const ( diff --git a/go/store/nbs/file_manifest_test.go b/go/store/nbs/file_manifest_test.go index bc0882578c..b5d190dc74 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/ld/dolt/go/store/constants" - "github.com/liquidata-inc/ld/dolt/go/store/hash" + "github.com/liquidata-inc/dolt/go/store/constants" + "github.com/liquidata-inc/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 7d30ca3470..02b3f20776 100644 --- a/go/store/nbs/file_table_persister.go +++ b/go/store/nbs/file_table_persister.go @@ -30,7 +30,7 @@ import ( "os" "path/filepath" - "github.com/liquidata-inc/ld/dolt/go/store/d" + "github.com/liquidata-inc/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 d89ee91d4c..94b5b3f79b 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/ld/dolt/go/store/d" - "github.com/liquidata-inc/ld/dolt/go/store/datas" - "github.com/liquidata-inc/ld/dolt/go/store/hash" - "github.com/liquidata-inc/ld/dolt/go/store/nbs" - "github.com/liquidata-inc/ld/dolt/go/store/types" - "github.com/liquidata-inc/ld/dolt/go/store/util/profile" + "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" ) var ( diff --git a/go/store/nbs/fs_table_cache.go b/go/store/nbs/fs_table_cache.go index aa2659bc49..6b8d320422 100644 --- a/go/store/nbs/fs_table_cache.go +++ b/go/store/nbs/fs_table_cache.go @@ -30,7 +30,7 @@ import ( "strings" "sync" - "github.com/liquidata-inc/ld/dolt/go/store/util/sizecache" + "github.com/liquidata-inc/dolt/go/store/util/sizecache" ) type tableCache interface { diff --git a/go/store/nbs/manifest.go b/go/store/nbs/manifest.go index bcf78dd507..bd51104fd0 100644 --- a/go/store/nbs/manifest.go +++ b/go/store/nbs/manifest.go @@ -29,8 +29,8 @@ import ( "sync" "time" - "github.com/liquidata-inc/ld/dolt/go/store/d" - "github.com/liquidata-inc/ld/dolt/go/store/hash" + "github.com/liquidata-inc/dolt/go/store/d" + "github.com/liquidata-inc/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 002a0a1b0a..56dc1d516b 100644 --- a/go/store/nbs/mem_table.go +++ b/go/store/nbs/mem_table.go @@ -27,8 +27,8 @@ import ( "sort" "sync" - "github.com/liquidata-inc/ld/dolt/go/store/chunks" - "github.com/liquidata-inc/ld/dolt/go/store/hash" + "github.com/liquidata-inc/dolt/go/store/chunks" + "github.com/liquidata-inc/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 20a7261d67..b47383a1b1 100644 --- a/go/store/nbs/mem_table_test.go +++ b/go/store/nbs/mem_table_test.go @@ -32,8 +32,8 @@ import ( "github.com/golang/snappy" "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/ld/dolt/go/store/chunks" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/store/chunks" + "github.com/liquidata-inc/dolt/go/store/types" ) func TestWriteChunks(t *testing.T) { diff --git a/go/store/nbs/must_test.go b/go/store/nbs/must_test.go index 93da81e22e..531a1a8936 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/ld/dolt/go/store/d" +import "github.com/liquidata-inc/dolt/go/store/d" func mustUint32(val uint32, err error) uint32 { d.PanicIfError(err) diff --git a/go/store/nbs/persisting_chunk_source.go b/go/store/nbs/persisting_chunk_source.go index 7a142b1b9d..f0323deb17 100644 --- a/go/store/nbs/persisting_chunk_source.go +++ b/go/store/nbs/persisting_chunk_source.go @@ -29,7 +29,7 @@ import ( "sync" "time" - "github.com/liquidata-inc/ld/dolt/go/store/chunks" + "github.com/liquidata-inc/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 a8106cbaab..dfca4b2b0d 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/ld/dolt/go/store/chunks" - "github.com/liquidata-inc/ld/dolt/go/store/constants" - "github.com/liquidata-inc/ld/dolt/go/store/hash" + "github.com/liquidata-inc/dolt/go/store/chunks" + "github.com/liquidata-inc/dolt/go/store/constants" + "github.com/liquidata-inc/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 3633bf24a5..d4c1550525 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/ld/dolt/go/store/d" - "github.com/liquidata-inc/ld/dolt/go/store/hash" + "github.com/liquidata-inc/dolt/go/store/d" + "github.com/liquidata-inc/dolt/go/store/hash" ) type mockAWSError string diff --git a/go/store/nbs/stats.go b/go/store/nbs/stats.go index 994d16c653..df6c5129ae 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/ld/dolt/go/store/metrics" + "github.com/liquidata-inc/dolt/go/store/metrics" ) type Stats struct { diff --git a/go/store/nbs/stats_test.go b/go/store/nbs/stats_test.go index e614a693e3..f2e4209a4d 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/ld/dolt/go/store/chunks" - "github.com/liquidata-inc/ld/dolt/go/store/constants" - "github.com/liquidata-inc/ld/dolt/go/store/hash" + "github.com/liquidata-inc/dolt/go/store/chunks" + "github.com/liquidata-inc/dolt/go/store/constants" + "github.com/liquidata-inc/dolt/go/store/hash" ) func TestStats(t *testing.T) { diff --git a/go/store/nbs/store.go b/go/store/nbs/store.go index 2c52eda3fc..2a1926b692 100644 --- a/go/store/nbs/store.go +++ b/go/store/nbs/store.go @@ -34,9 +34,9 @@ import ( "github.com/dustin/go-humanize" "github.com/pkg/errors" - "github.com/liquidata-inc/ld/dolt/go/store/blobstore" - "github.com/liquidata-inc/ld/dolt/go/store/chunks" - "github.com/liquidata-inc/ld/dolt/go/store/hash" + "github.com/liquidata-inc/dolt/go/store/blobstore" + "github.com/liquidata-inc/dolt/go/store/chunks" + "github.com/liquidata-inc/dolt/go/store/hash" ) var ErrFetchFailure = errors.New("fetch failed") diff --git a/go/store/nbs/table.go b/go/store/nbs/table.go index 00edc1a332..9a0c7a3724 100644 --- a/go/store/nbs/table.go +++ b/go/store/nbs/table.go @@ -31,7 +31,7 @@ import ( "io" "sync" - "github.com/liquidata-inc/ld/dolt/go/store/chunks" + "github.com/liquidata-inc/dolt/go/store/chunks" ) /* diff --git a/go/store/nbs/table_persister.go b/go/store/nbs/table_persister.go index 57ece665b2..27a7408050 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/ld/dolt/go/store/util/sizecache" + "github.com/liquidata-inc/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 9d687ba9a4..c1369f4db4 100644 --- a/go/store/nbs/table_reader.go +++ b/go/store/nbs/table_reader.go @@ -32,8 +32,8 @@ import ( "github.com/golang/snappy" - "github.com/liquidata-inc/ld/dolt/go/store/chunks" - "github.com/liquidata-inc/ld/dolt/go/store/hash" + "github.com/liquidata-inc/dolt/go/store/chunks" + "github.com/liquidata-inc/dolt/go/store/hash" ) var ErrInvalidTableFile = errors.New("invalid or corrupt table file") diff --git a/go/store/nbs/table_set.go b/go/store/nbs/table_set.go index 0ca9d429d9..aacd8ad3d9 100644 --- a/go/store/nbs/table_set.go +++ b/go/store/nbs/table_set.go @@ -26,7 +26,7 @@ import ( "errors" "sync" - "github.com/liquidata-inc/ld/dolt/go/store/chunks" + "github.com/liquidata-inc/dolt/go/store/chunks" ) const concurrentCompactions = 5 diff --git a/go/store/nbs/table_test.go b/go/store/nbs/table_test.go index cacc377387..e6c5ae8fe9 100644 --- a/go/store/nbs/table_test.go +++ b/go/store/nbs/table_test.go @@ -31,8 +31,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/ld/dolt/go/store/chunks" - "github.com/liquidata-inc/ld/dolt/go/store/hash" + "github.com/liquidata-inc/dolt/go/store/chunks" + "github.com/liquidata-inc/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 31e7b41059..de5fc936be 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/ld/dolt/go/store/d" + "github.com/liquidata-inc/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 3e4e748442..aa4413f5d0 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/ld/dolt/go/store/d" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/store/d" + "github.com/liquidata-inc/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 685c5a6846..35fbdb18bd 100644 --- a/go/store/nomdl/parser_test.go +++ b/go/store/nomdl/parser_test.go @@ -29,8 +29,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/ld/dolt/go/store/chunks" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/store/chunks" + "github.com/liquidata-inc/dolt/go/store/types" ) func newTestValueStore() *types.ValueStore { diff --git a/go/store/perf/codec-perf-rig/main.go b/go/store/perf/codec-perf-rig/main.go index eb58556d08..4d9f4b672d 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/ld/dolt/go/store/chunks" - "github.com/liquidata-inc/ld/dolt/go/store/d" - "github.com/liquidata-inc/ld/dolt/go/store/datas" - "github.com/liquidata-inc/ld/dolt/go/store/types" - "github.com/liquidata-inc/ld/dolt/go/store/util/profile" + "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" ) var ( diff --git a/go/store/perf/suite/suite.go b/go/store/perf/suite/suite.go index e6431f571d..677f960919 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/ld/dolt/go/libraries/utils/osutil" - "github.com/liquidata-inc/ld/dolt/go/store/chunks" - "github.com/liquidata-inc/ld/dolt/go/store/datas" - "github.com/liquidata-inc/ld/dolt/go/store/marshal" - "github.com/liquidata-inc/ld/dolt/go/store/spec" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) var ( diff --git a/go/store/perf/suite/suite_test.go b/go/store/perf/suite/suite_test.go index 0790beb1bb..36eff379ed 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/ld/dolt/go/store/spec" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/store/spec" + "github.com/liquidata-inc/dolt/go/store/types" ) type testSuite struct { diff --git a/go/store/sloppy/sloppy.go b/go/store/sloppy/sloppy.go index be09cec28a..94a1262e87 100644 --- a/go/store/sloppy/sloppy.go +++ b/go/store/sloppy/sloppy.go @@ -22,7 +22,7 @@ package sloppy import ( - "github.com/liquidata-inc/ld/dolt/go/store/d" + "github.com/liquidata-inc/dolt/go/store/d" ) const ( diff --git a/go/store/spec/absolute_path.go b/go/store/spec/absolute_path.go index ff91c82ce2..5e1136b73b 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/ld/dolt/go/store/d" + "github.com/liquidata-inc/dolt/go/store/d" - "github.com/liquidata-inc/ld/dolt/go/store/datas" - "github.com/liquidata-inc/ld/dolt/go/store/hash" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/store/datas" + "github.com/liquidata-inc/dolt/go/store/hash" + "github.com/liquidata-inc/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 529a4d80ab..bb682ec6e8 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/ld/dolt/go/store/chunks" - "github.com/liquidata-inc/ld/dolt/go/store/datas" - "github.com/liquidata-inc/ld/dolt/go/store/hash" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) func TestAbsolutePathToAndFromString(t *testing.T) { diff --git a/go/store/spec/commit_meta.go b/go/store/spec/commit_meta.go index 17d5c96e41..fcb45c1395 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/ld/dolt/go/store/datas" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/store/datas" + "github.com/liquidata-inc/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 61a25f80d2..fe098b239e 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/ld/dolt/go/store/chunks" - "github.com/liquidata-inc/ld/dolt/go/store/datas" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/store/chunks" + "github.com/liquidata-inc/dolt/go/store/datas" + "github.com/liquidata-inc/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 0908b25dac..a79535c1f4 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/ld/dolt/go/store/chunks" - "github.com/liquidata-inc/ld/dolt/go/store/d" - "github.com/liquidata-inc/ld/dolt/go/store/datas" - "github.com/liquidata-inc/ld/dolt/go/store/nbs" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) const ( diff --git a/go/store/spec/spec_test.go b/go/store/spec/spec_test.go index 96d6e5c078..f09ca4a8f3 100644 --- a/go/store/spec/spec_test.go +++ b/go/store/spec/spec_test.go @@ -31,11 +31,11 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/ld/dolt/go/store/chunks" - "github.com/liquidata-inc/ld/dolt/go/store/d" - "github.com/liquidata-inc/ld/dolt/go/store/datas" - "github.com/liquidata-inc/ld/dolt/go/store/nbs" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "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" ) func TestMemDatabaseSpec(t *testing.T) { diff --git a/go/store/spec/util.go b/go/store/spec/util.go index f2b31fd0b8..46ac7b84b3 100644 --- a/go/store/spec/util.go +++ b/go/store/spec/util.go @@ -22,8 +22,8 @@ package spec import ( - "github.com/liquidata-inc/ld/dolt/go/store/d" - "github.com/liquidata-inc/ld/dolt/go/store/hash" + "github.com/liquidata-inc/dolt/go/store/d" + "github.com/liquidata-inc/dolt/go/store/hash" ) func CreateDatabaseSpecString(protocol, db string) string { diff --git a/go/store/types/blob.go b/go/store/types/blob.go index d9883c8a12..253ef1dbb7 100644 --- a/go/store/types/blob.go +++ b/go/store/types/blob.go @@ -29,7 +29,7 @@ import ( "runtime" - "github.com/liquidata-inc/ld/dolt/go/store/d" + "github.com/liquidata-inc/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 cabfdf782f..e1bb8ba943 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/ld/dolt/go/store/d" +import "github.com/liquidata-inc/dolt/go/store/d" type blobLeafSequence struct { leafSequence diff --git a/go/store/types/bool.go b/go/store/types/bool.go index 263a796869..579d8d5b04 100644 --- a/go/store/types/bool.go +++ b/go/store/types/bool.go @@ -24,7 +24,7 @@ package types import ( "context" - "github.com/liquidata-inc/ld/dolt/go/store/hash" + "github.com/liquidata-inc/dolt/go/store/hash" ) // Bool is a Noms Value wrapper around the primitive bool type. diff --git a/go/store/types/codec.go b/go/store/types/codec.go index f80d21c2c7..f6ce1463d3 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/ld/dolt/go/store/chunks" - "github.com/liquidata-inc/ld/dolt/go/store/d" - "github.com/liquidata-inc/ld/dolt/go/store/hash" + "github.com/liquidata-inc/dolt/go/store/chunks" + "github.com/liquidata-inc/dolt/go/store/d" + "github.com/liquidata-inc/dolt/go/store/hash" ) const initialBufferSize = 2048 diff --git a/go/store/types/common_supertype.go b/go/store/types/common_supertype.go index 4740c948bb..23a38ea732 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/ld/dolt/go/store/d" +import "github.com/liquidata-inc/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 33a636cd9a..09d48abf48 100644 --- a/go/store/types/compare_test.go +++ b/go/store/types/compare_test.go @@ -28,8 +28,8 @@ import ( "sort" "testing" - "github.com/liquidata-inc/ld/dolt/go/store/d" - "github.com/liquidata-inc/ld/dolt/go/store/hash" + "github.com/liquidata-inc/dolt/go/store/d" + "github.com/liquidata-inc/dolt/go/store/hash" "github.com/stretchr/testify/assert" ) diff --git a/go/store/types/edits/async_sorted_edits.go b/go/store/types/edits/async_sorted_edits.go index 28ccaca17b..75c892b298 100644 --- a/go/store/types/edits/async_sorted_edits.go +++ b/go/store/types/edits/async_sorted_edits.go @@ -17,7 +17,7 @@ package edits import ( "sort" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/store/types" ) func sorter(nbf *types.NomsBinFormat, in, out chan types.KVPSlice) { diff --git a/go/store/types/edits/async_sorted_edits_test.go b/go/store/types/edits/async_sorted_edits_test.go index f13963a3c0..e4816415ff 100644 --- a/go/store/types/edits/async_sorted_edits_test.go +++ b/go/store/types/edits/async_sorted_edits_test.go @@ -19,7 +19,7 @@ import ( "testing" "time" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/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 f2b9f3a5b5..9d35d83abd 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/ld/dolt/go/store/types" +import "github.com/liquidata-inc/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 5ee1dd37ef..f9e9a144b9 100644 --- a/go/store/types/edits/kvp_coll_builder_test.go +++ b/go/store/types/edits/kvp_coll_builder_test.go @@ -17,7 +17,7 @@ package edits import ( "testing" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/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 d6464a343c..f35be3c757 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/ld/dolt/go/store/types" +import "github.com/liquidata-inc/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 033c00b24c..ec564258c8 100644 --- a/go/store/types/edits/kvp_coll_itr_test.go +++ b/go/store/types/edits/kvp_coll_itr_test.go @@ -18,7 +18,7 @@ import ( "context" "testing" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/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 493ddfb9b4..f4aa463fac 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/ld/dolt/go/store/types" +import "github.com/liquidata-inc/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 a81e2475ed..eadadc770e 100644 --- a/go/store/types/edits/kvp_collection_test.go +++ b/go/store/types/edits/kvp_collection_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/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 65297af143..a302a5737f 100644 --- a/go/store/types/edits/kvp_itr_test.go +++ b/go/store/types/edits/kvp_itr_test.go @@ -19,7 +19,7 @@ import ( "sort" "testing" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/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 dbb21ade7f..cb663cb0db 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/ld/dolt/go/store/types" +import "github.com/liquidata-inc/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 c9454f8659..7c08fb779e 100644 --- a/go/store/types/encode_human_readable.go +++ b/go/store/types/encode_human_readable.go @@ -32,8 +32,8 @@ import ( humanize "github.com/dustin/go-humanize" "github.com/google/uuid" - "github.com/liquidata-inc/ld/dolt/go/store/d" - "github.com/liquidata-inc/ld/dolt/go/store/util/writers" + "github.com/liquidata-inc/dolt/go/store/d" + "github.com/liquidata-inc/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 4e8646bd7b..b2416941fc 100644 --- a/go/store/types/encode_human_readable_test.go +++ b/go/store/types/encode_human_readable_test.go @@ -30,7 +30,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/ld/dolt/go/store/util/test" + "github.com/liquidata-inc/dolt/go/store/util/test" ) 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 a12ce602c9..4e50417329 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/ld/dolt/go/store/hash" + "github.com/liquidata-inc/dolt/go/store/hash" ) func toBinaryNomsReaderData(data []interface{}) []byte { diff --git a/go/store/types/float.go b/go/store/types/float.go index 9e91bf5833..bb52a64ea9 100644 --- a/go/store/types/float.go +++ b/go/store/types/float.go @@ -25,7 +25,7 @@ import ( "context" "encoding/binary" - "github.com/liquidata-inc/ld/dolt/go/store/hash" + "github.com/liquidata-inc/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 a0e5495bd6..6c7eced2b6 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/ld/dolt/go/store/constants" + "github.com/liquidata-inc/dolt/go/store/constants" ) func init() { diff --git a/go/store/types/get_hash.go b/go/store/types/get_hash.go index b9a1235c75..26009c98d4 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/ld/dolt/go/store/hash" +import "github.com/liquidata-inc/dolt/go/store/hash" var getHashOverride func(v Value) hash.Hash diff --git a/go/store/types/incremental_test.go b/go/store/types/incremental_test.go index e9cb5e3e45..9bf6602962 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/ld/dolt/go/store/chunks" + "github.com/liquidata-inc/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 b175405d40..888b0df988 100644 --- a/go/store/types/indexed_sequences.go +++ b/go/store/types/indexed_sequences.go @@ -24,8 +24,8 @@ package types import ( "context" - "github.com/liquidata-inc/ld/dolt/go/store/d" - "github.com/liquidata-inc/ld/dolt/go/store/hash" + "github.com/liquidata-inc/dolt/go/store/d" + "github.com/liquidata-inc/dolt/go/store/hash" ) func newListMetaSequence(level uint64, tuples []metaTuple, vrw ValueReadWriter) metaSequence { diff --git a/go/store/types/int.go b/go/store/types/int.go index 4e0bca4d29..4e3f55350c 100644 --- a/go/store/types/int.go +++ b/go/store/types/int.go @@ -25,7 +25,7 @@ import ( "context" "encoding/binary" - "github.com/liquidata-inc/ld/dolt/go/store/hash" + "github.com/liquidata-inc/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 4f0fe12e50..019e924a0f 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/ld/dolt/go/store/d" + "github.com/liquidata-inc/dolt/go/store/d" ) type leafSequence struct { diff --git a/go/store/types/less.go b/go/store/types/less.go index c16322405d..ed39a5cea3 100644 --- a/go/store/types/less.go +++ b/go/store/types/less.go @@ -22,7 +22,7 @@ package types import ( - "github.com/liquidata-inc/ld/dolt/go/store/hash" + "github.com/liquidata-inc/dolt/go/store/hash" ) type kindAndHash interface { diff --git a/go/store/types/list.go b/go/store/types/list.go index 01051480cf..a52d43d4d8 100644 --- a/go/store/types/list.go +++ b/go/store/types/list.go @@ -25,7 +25,7 @@ import ( "context" "sync/atomic" - "github.com/liquidata-inc/ld/dolt/go/store/d" + "github.com/liquidata-inc/dolt/go/store/d" ) var EmptyList List diff --git a/go/store/types/list_editor.go b/go/store/types/list_editor.go index d895be55d7..7696204ec9 100644 --- a/go/store/types/list_editor.go +++ b/go/store/types/list_editor.go @@ -25,7 +25,7 @@ import ( "context" "sync" - "github.com/liquidata-inc/ld/dolt/go/store/d" + "github.com/liquidata-inc/dolt/go/store/d" ) type ListEditor struct { diff --git a/go/store/types/list_iterator.go b/go/store/types/list_iterator.go index 76d6ddb9d4..8e7af012c3 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/ld/dolt/go/store/d" + "github.com/liquidata-inc/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 bc2e5ad91d..2a568a7595 100644 --- a/go/store/types/list_test.go +++ b/go/store/types/list_test.go @@ -29,7 +29,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" - "github.com/liquidata-inc/ld/dolt/go/store/chunks" + "github.com/liquidata-inc/dolt/go/store/chunks" ) const testListSize = 5000 diff --git a/go/store/types/make_type.go b/go/store/types/make_type.go index fa5d69fd4d..50da0cd10b 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/ld/dolt/go/store/d" + "github.com/liquidata-inc/dolt/go/store/d" ) func MakePrimitiveType(k NomsKind) *Type { diff --git a/go/store/types/map.go b/go/store/types/map.go index 70e2f433ae..9b65d1422f 100644 --- a/go/store/types/map.go +++ b/go/store/types/map.go @@ -26,7 +26,7 @@ import ( "fmt" "sort" - "github.com/liquidata-inc/ld/dolt/go/store/d" + "github.com/liquidata-inc/dolt/go/store/d" ) var EmptyMap Map diff --git a/go/store/types/map_editor.go b/go/store/types/map_editor.go index 3c779c5d42..07770462d2 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/ld/dolt/go/store/d" + "github.com/liquidata-inc/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 8f5226e39e..0fa2b3fdb1 100644 --- a/go/store/types/map_leaf_sequence.go +++ b/go/store/types/map_leaf_sequence.go @@ -24,7 +24,7 @@ package types import ( "sort" - "github.com/liquidata-inc/ld/dolt/go/store/d" + "github.com/liquidata-inc/dolt/go/store/d" ) type mapLeafSequence struct { diff --git a/go/store/types/map_test.go b/go/store/types/map_test.go index a130ce2e73..8095941371 100644 --- a/go/store/types/map_test.go +++ b/go/store/types/map_test.go @@ -34,7 +34,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" - "github.com/liquidata-inc/ld/dolt/go/store/chunks" + "github.com/liquidata-inc/dolt/go/store/chunks" ) const testMapSize = 8000 diff --git a/go/store/types/meta_sequence.go b/go/store/types/meta_sequence.go index 7927e8c848..e65f68b0c9 100644 --- a/go/store/types/meta_sequence.go +++ b/go/store/types/meta_sequence.go @@ -25,8 +25,8 @@ import ( "context" "sort" - "github.com/liquidata-inc/ld/dolt/go/store/d" - "github.com/liquidata-inc/ld/dolt/go/store/hash" + "github.com/liquidata-inc/dolt/go/store/d" + "github.com/liquidata-inc/dolt/go/store/hash" ) var emptyKey = orderedKey{} diff --git a/go/store/types/null_value.go b/go/store/types/null_value.go index 08b4a1fa8d..726e995236 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/ld/dolt/go/store/hash" + "github.com/liquidata-inc/dolt/go/store/hash" ) var NullValue Null diff --git a/go/store/types/ordered_sequences.go b/go/store/types/ordered_sequences.go index c3fe01c64c..e00e1fcd37 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/ld/dolt/go/store/d" + "github.com/liquidata-inc/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 da451f554a..65cebfdbe8 100644 --- a/go/store/types/ordered_sequences_diff.go +++ b/go/store/types/ordered_sequences_diff.go @@ -25,8 +25,8 @@ import ( "context" "sync" - "github.com/liquidata-inc/ld/dolt/go/store/d" - "github.com/liquidata-inc/ld/dolt/go/store/util/functions" + "github.com/liquidata-inc/dolt/go/store/d" + "github.com/liquidata-inc/dolt/go/store/util/functions" ) type DiffChangeType uint8 diff --git a/go/store/types/path.go b/go/store/types/path.go index 129906faae..6cbbe0275e 100644 --- a/go/store/types/path.go +++ b/go/store/types/path.go @@ -31,8 +31,8 @@ import ( "strconv" "strings" - "github.com/liquidata-inc/ld/dolt/go/store/d" - "github.com/liquidata-inc/ld/dolt/go/store/hash" + "github.com/liquidata-inc/dolt/go/store/d" + "github.com/liquidata-inc/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 06b233b140..0daa0d94e5 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/ld/dolt/go/store/hash" + "github.com/liquidata-inc/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 069603c76e..bbe4529f3e 100644 --- a/go/store/types/perf/perf_test.go +++ b/go/store/types/perf/perf_test.go @@ -31,8 +31,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/ld/dolt/go/store/perf/suite" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/store/perf/suite" + "github.com/liquidata-inc/dolt/go/store/types" ) type perfSuite struct { diff --git a/go/store/types/ref.go b/go/store/types/ref.go index 36b9b12625..8c22c6bc64 100644 --- a/go/store/types/ref.go +++ b/go/store/types/ref.go @@ -25,7 +25,7 @@ import ( "bytes" "context" - "github.com/liquidata-inc/ld/dolt/go/store/hash" + "github.com/liquidata-inc/dolt/go/store/hash" ) type Ref struct { diff --git a/go/store/types/ref_heap.go b/go/store/types/ref_heap.go index 9e42e7fdd9..e181b9ad1b 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/ld/dolt/go/store/hash" + "github.com/liquidata-inc/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 ececebb31d..f0cb6abd71 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/ld/dolt/go/store/sloppy" + "github.com/liquidata-inc/dolt/go/store/sloppy" "github.com/kch42/buzhash" ) diff --git a/go/store/types/sequence.go b/go/store/types/sequence.go index 37c2010d3a..469e890850 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/ld/dolt/go/store/d" - "github.com/liquidata-inc/ld/dolt/go/store/hash" + "github.com/liquidata-inc/dolt/go/store/d" + "github.com/liquidata-inc/dolt/go/store/hash" ) type sequenceItem interface{} diff --git a/go/store/types/sequence_chunker.go b/go/store/types/sequence_chunker.go index b79d6a095b..37703f3d08 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/ld/dolt/go/store/d" + "github.com/liquidata-inc/dolt/go/store/d" ) type hashValueBytesFn func(item sequenceItem, rv *rollingValueHasher) diff --git a/go/store/types/sequence_concat.go b/go/store/types/sequence_concat.go index 24e8235c70..ca345e74da 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/ld/dolt/go/store/d" + "github.com/liquidata-inc/dolt/go/store/d" ) type newSequenceChunkerFn func(cur *sequenceCursor, vrw ValueReadWriter) *sequenceChunker diff --git a/go/store/types/sequence_cursor.go b/go/store/types/sequence_cursor.go index c9ca05b2c5..b14ea0d67b 100644 --- a/go/store/types/sequence_cursor.go +++ b/go/store/types/sequence_cursor.go @@ -22,7 +22,7 @@ package types import "context" -import "github.com/liquidata-inc/ld/dolt/go/store/d" +import "github.com/liquidata-inc/dolt/go/store/d" import "fmt" // sequenceCursor explores a tree of sequence items. diff --git a/go/store/types/sequence_cursor_test.go b/go/store/types/sequence_cursor_test.go index 9977aba567..b1ef0d829f 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/ld/dolt/go/store/hash" + "github.com/liquidata-inc/dolt/go/store/hash" ) type testSequence struct { diff --git a/go/store/types/set.go b/go/store/types/set.go index df765f04a7..e7eff0307c 100644 --- a/go/store/types/set.go +++ b/go/store/types/set.go @@ -26,7 +26,7 @@ import ( "fmt" "sort" - "github.com/liquidata-inc/ld/dolt/go/store/d" + "github.com/liquidata-inc/dolt/go/store/d" ) var EmptySet Set diff --git a/go/store/types/set_editor.go b/go/store/types/set_editor.go index a0baf3dceb..fe3694009f 100644 --- a/go/store/types/set_editor.go +++ b/go/store/types/set_editor.go @@ -25,7 +25,7 @@ import ( "context" "sort" - "github.com/liquidata-inc/ld/dolt/go/store/d" + "github.com/liquidata-inc/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 b15fb259fb..074238b4a4 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/ld/dolt/go/store/d" + "github.com/liquidata-inc/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/simplify.go b/go/store/types/simplify.go index 4ca9f46fa6..53a3e149dc 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/ld/dolt/go/store/d" + "github.com/liquidata-inc/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 20b43217c2..b79d1ba306 100644 --- a/go/store/types/string.go +++ b/go/store/types/string.go @@ -25,7 +25,7 @@ import ( "context" "encoding/binary" - "github.com/liquidata-inc/ld/dolt/go/store/hash" + "github.com/liquidata-inc/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 840ab1aa91..b047ad0d59 100644 --- a/go/store/types/struct.go +++ b/go/store/types/struct.go @@ -29,7 +29,7 @@ import ( "sort" "strings" - "github.com/liquidata-inc/ld/dolt/go/store/d" + "github.com/liquidata-inc/dolt/go/store/d" ) var EmptyStructType = MakeStructType("") diff --git a/go/store/types/subtype.go b/go/store/types/subtype.go index 0c17507e72..65d1c8ac5c 100644 --- a/go/store/types/subtype.go +++ b/go/store/types/subtype.go @@ -24,7 +24,7 @@ package types import ( "context" - "github.com/liquidata-inc/ld/dolt/go/store/d" + "github.com/liquidata-inc/dolt/go/store/d" ) func assertSubtype(ctx context.Context, nbf *NomsBinFormat, t *Type, v Value) { diff --git a/go/store/types/subtype_test.go b/go/store/types/subtype_test.go index c3d1cf2cd5..2314151913 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/ld/dolt/go/store/d" + "github.com/liquidata-inc/dolt/go/store/d" ) func assertInvalid(tt *testing.T, t *Type, v Value) { diff --git a/go/store/types/tuple.go b/go/store/types/tuple.go index e74cd99fa0..1de94c6ac8 100644 --- a/go/store/types/tuple.go +++ b/go/store/types/tuple.go @@ -25,7 +25,7 @@ import ( "context" "fmt" - "github.com/liquidata-inc/ld/dolt/go/store/d" + "github.com/liquidata-inc/dolt/go/store/d" ) func EmptyTuple(nbf *NomsBinFormat) Tuple { diff --git a/go/store/types/type.go b/go/store/types/type.go index 9914b2fe7a..15ce7f6683 100644 --- a/go/store/types/type.go +++ b/go/store/types/type.go @@ -25,7 +25,7 @@ package types import ( "context" - "github.com/liquidata-inc/ld/dolt/go/store/hash" + "github.com/liquidata-inc/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 7c09d31e49..9a527d1b11 100644 --- a/go/store/types/uint.go +++ b/go/store/types/uint.go @@ -25,7 +25,7 @@ import ( "context" "encoding/binary" - "github.com/liquidata-inc/ld/dolt/go/store/hash" + "github.com/liquidata-inc/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 4e07331a38..42174d9571 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/ld/dolt/go/store/d" - "github.com/liquidata-inc/ld/dolt/go/store/hash" + "github.com/liquidata-inc/dolt/go/store/d" + "github.com/liquidata-inc/dolt/go/store/hash" ) type iterator interface { diff --git a/go/store/types/uuid.go b/go/store/types/uuid.go index 751e22216c..8bd9895659 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/ld/dolt/go/store/hash" + "github.com/liquidata-inc/dolt/go/store/hash" ) const ( diff --git a/go/store/types/validating_decoder.go b/go/store/types/validating_decoder.go index 8732c70e34..9e21b85386 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/ld/dolt/go/store/chunks" - "github.com/liquidata-inc/ld/dolt/go/store/d" + "github.com/liquidata-inc/dolt/go/store/chunks" + "github.com/liquidata-inc/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 dd5db81874..3fb1f1ec0f 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/ld/dolt/go/store/chunks" + "github.com/liquidata-inc/dolt/go/store/chunks" ) func TestValidatingBatchingSinkDecode(t *testing.T) { diff --git a/go/store/types/value.go b/go/store/types/value.go index 081f44d772..d6857661e5 100644 --- a/go/store/types/value.go +++ b/go/store/types/value.go @@ -25,7 +25,7 @@ import ( "bytes" "context" - "github.com/liquidata-inc/ld/dolt/go/store/hash" + "github.com/liquidata-inc/dolt/go/store/hash" ) type ValueCallback func(v Value) diff --git a/go/store/types/value_decoder.go b/go/store/types/value_decoder.go index c94df1de90..e2f5a4c1c7 100644 --- a/go/store/types/value_decoder.go +++ b/go/store/types/value_decoder.go @@ -21,7 +21,7 @@ package types -import "github.com/liquidata-inc/ld/dolt/go/store/d" +import "github.com/liquidata-inc/dolt/go/store/d" type valueDecoder struct { typedBinaryNomsReader diff --git a/go/store/types/value_stats.go b/go/store/types/value_stats.go index cde0fd28b4..4d90a8e6a0 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/ld/dolt/go/store/hash" + "github.com/liquidata-inc/dolt/go/store/hash" ) type ValueStats interface { diff --git a/go/store/types/value_store.go b/go/store/types/value_store.go index af9c6c0af6..e4e5b95950 100644 --- a/go/store/types/value_store.go +++ b/go/store/types/value_store.go @@ -25,10 +25,10 @@ import ( "context" "sync" - "github.com/liquidata-inc/ld/dolt/go/store/chunks" - "github.com/liquidata-inc/ld/dolt/go/store/d" - "github.com/liquidata-inc/ld/dolt/go/store/hash" - "github.com/liquidata-inc/ld/dolt/go/store/util/sizecache" + "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" ) // 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 35e5489819..9fa428787a 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/ld/dolt/go/store/chunks" - "github.com/liquidata-inc/ld/dolt/go/store/hash" + "github.com/liquidata-inc/dolt/go/store/chunks" + "github.com/liquidata-inc/dolt/go/store/hash" ) func TestValueReadWriteRead(t *testing.T) { diff --git a/go/store/types/walk.go b/go/store/types/walk.go index f15ee58ced..ef1e1d4d78 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/ld/dolt/go/store/hash" + "github.com/liquidata-inc/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 cd156d51b2..56f03ba5e7 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/ld/dolt/go/store/chunks" - "github.com/liquidata-inc/ld/dolt/go/store/d" + "github.com/liquidata-inc/dolt/go/store/chunks" + "github.com/liquidata-inc/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 fa2cf74197..a7892d572d 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/ld/dolt/go/store/hash" + "github.com/liquidata-inc/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 f2fbe885ab..3b78fa43ac 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/ld/dolt/go/store/chunks" + "github.com/liquidata-inc/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 fa08e5b9e6..ab86405592 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/ld/dolt/go/libraries/utils/osutil" - "github.com/liquidata-inc/ld/dolt/go/store/d" - "github.com/liquidata-inc/ld/dolt/go/store/util/exit" + "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" ) 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 7fe3423919..9660bdd3ce 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/ld/dolt/go/store/marshal" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/store/marshal" + "github.com/liquidata-inc/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 dcf40aa7d7..009b191d6f 100644 --- a/go/store/util/datetime/date_time_test.go +++ b/go/store/util/datetime/date_time_test.go @@ -29,9 +29,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/liquidata-inc/ld/dolt/go/store/chunks" - "github.com/liquidata-inc/ld/dolt/go/store/marshal" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/store/chunks" + "github.com/liquidata-inc/dolt/go/store/marshal" + "github.com/liquidata-inc/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 be4aac89d1..e1a5fc0fbe 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/ld/dolt/go/store/d" + "github.com/liquidata-inc/dolt/go/store/d" ) var ( diff --git a/go/store/util/profile/profile.go b/go/store/util/profile/profile.go index 1493f15a86..c6782bde93 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/ld/dolt/go/store/d" + "github.com/liquidata-inc/dolt/go/store/d" ) var ( diff --git a/go/store/util/progressreader/reader.go b/go/store/util/progressreader/reader.go index 03f6cc76bc..230d6f17af 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/ld/dolt/go/store/util/status" + "github.com/liquidata-inc/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 3a38352662..8311ca2dad 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/ld/dolt/go/store/d" + "github.com/liquidata-inc/dolt/go/store/d" ) var ( diff --git a/go/store/util/sizecache/size_cache.go b/go/store/util/sizecache/size_cache.go index d26552a559..5cab11e505 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/ld/dolt/go/store/d" + "github.com/liquidata-inc/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 11940cb586..193c35bebd 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/ld/dolt/go/store/hash" + "github.com/liquidata-inc/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 1d2afb95b3..344c2255f9 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/ld/dolt/go/store/hash" + "github.com/liquidata-inc/dolt/go/store/hash" ) var pattern = regexp.MustCompile("([0-9a-v]{" + strconv.Itoa(hash.StringLen) + "})") diff --git a/go/utils/remotesrv/cscache.go b/go/utils/remotesrv/cscache.go index d2aa222aab..9d15ac91ec 100644 --- a/go/utils/remotesrv/cscache.go +++ b/go/utils/remotesrv/cscache.go @@ -19,9 +19,9 @@ import ( "path/filepath" "sync" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/filesys" - "github.com/liquidata-inc/ld/dolt/go/store/nbs" - "github.com/liquidata-inc/ld/dolt/go/store/types" + "github.com/liquidata-inc/dolt/go/libraries/utils/filesys" + "github.com/liquidata-inc/dolt/go/store/nbs" + "github.com/liquidata-inc/dolt/go/store/types" ) const ( diff --git a/go/utils/remotesrv/grpc.go b/go/utils/remotesrv/grpc.go index 44d3d59969..c846b6118e 100644 --- a/go/utils/remotesrv/grpc.go +++ b/go/utils/remotesrv/grpc.go @@ -23,10 +23,10 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - remotesapi "github.com/liquidata-inc/ld/dolt/go/gen/proto/dolt/services/remotesapi_v1alpha1" - "github.com/liquidata-inc/ld/dolt/go/libraries/doltcore/remotestorage" - "github.com/liquidata-inc/ld/dolt/go/store/hash" - "github.com/liquidata-inc/ld/dolt/go/store/nbs" + 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" ) type RemoteChunkStore struct { diff --git a/go/utils/remotesrv/http.go b/go/utils/remotesrv/http.go index 10b2e41cbd..6a4ed1c4a3 100644 --- a/go/utils/remotesrv/http.go +++ b/go/utils/remotesrv/http.go @@ -25,8 +25,8 @@ import ( "strconv" "strings" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/iohelp" - "github.com/liquidata-inc/ld/dolt/go/store/hash" + "github.com/liquidata-inc/dolt/go/libraries/utils/iohelp" + "github.com/liquidata-inc/dolt/go/store/hash" ) func ServeHTTP(respWr http.ResponseWriter, req *http.Request) { diff --git a/go/utils/remotesrv/main.go b/go/utils/remotesrv/main.go index dc73796c62..ba64954892 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/ld/dolt/go/gen/proto/dolt/services/remotesapi_v1alpha1" - "github.com/liquidata-inc/ld/dolt/go/libraries/utils/filesys" + remotesapi "github.com/liquidata-inc/dolt/go/gen/proto/dolt/services/remotesapi_v1alpha1" + "github.com/liquidata-inc/dolt/go/libraries/utils/filesys" ) func main() { diff --git a/go/utils/repofmt/check_fmt.sh b/go/utils/repofmt/check_fmt.sh index 7a42b498d1..8522c49e6d 100755 --- a/go/utils/repofmt/check_fmt.sh +++ b/go/utils/repofmt/check_fmt.sh @@ -5,12 +5,12 @@ set -eo pipefail script_dir=$(dirname "$0") cd $script_dir/../.. -bad_files=$(goimports -l -local github.com/liquidata-inc/ld .) +bad_files=$(goimports -l -local github.com/liquidata-inc/dolt .) if [ "$bad_files" != "" ]; then echo "ERROR: The following files do not match goimports output:" echo "$bad_files" echo - echo "Please format the go code in the repository with 'goimports -l -local github.com/liquidata-inc/ld .'" + echo "Please format the go code in the repository with 'goimports -l -local github.com/liquidata-inc/dolt .'" exit 1 fi