From 8e4922a775ac246bce33300d539174da57000614 Mon Sep 17 00:00:00 2001 From: nicktobey Date: Tue, 2 Jan 2024 08:16:31 +0000 Subject: [PATCH] [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh --- go/go.sum | 4 ---- go/libraries/doltcore/merge/fulltext_table.go | 2 +- go/libraries/doltcore/merge/merge_prolly_rows.go | 16 +++++++++------- .../doltcore/merge/three_way_json_differ.go | 6 ++++-- .../doltcore/sqle/dsess/autoincrement_tracker.go | 2 +- .../sqle/dtables/conflicts_tables_prolly.go | 1 + .../sqle/dtables/constraint_violations_prolly.go | 1 + .../doltcore/sqle/dtables/prolly_row_conv.go | 1 + go/libraries/doltcore/sqle/stats/rebuild_test.go | 2 +- go/libraries/doltcore/sqle/testutil.go | 2 +- .../doltcore/sqle/writer/prolly_fk_indexer.go | 2 +- .../doltcore/sqle/writer/prolly_index_writer.go | 2 +- .../sqle/writer/prolly_index_writer_keyless.go | 2 +- go/store/prolly/tree/json_diff.go | 3 ++- go/store/prolly/tree/json_diff_test.go | 5 +++-- go/store/prolly/tree/node.go | 3 ++- 16 files changed, 30 insertions(+), 24 deletions(-) mode change 100755 => 100644 go/libraries/doltcore/sqle/dsess/autoincrement_tracker.go diff --git a/go/go.sum b/go/go.sum index ba080eaad4..6caeab699e 100644 --- a/go/go.sum +++ b/go/go.sum @@ -183,10 +183,6 @@ github.com/dolthub/fslock v0.0.3 h1:iLMpUIvJKMKm92+N1fmHVdxJP5NdyDK5bK7z7Ba2s2U= github.com/dolthub/fslock v0.0.3/go.mod h1:QWql+P17oAAMLnL4HGB5tiovtDuAjdDTPbuqx7bYfa0= github.com/dolthub/go-icu-regex v0.0.0-20230524105445-af7e7991c97e h1:kPsT4a47cw1+y/N5SSCkma7FhAPw7KeGmD6c9PBZW9Y= github.com/dolthub/go-icu-regex v0.0.0-20230524105445-af7e7991c97e/go.mod h1:KPUcpx070QOfJK1gNe0zx4pA5sicIK1GMikIGLKC168= -github.com/dolthub/go-mysql-server v0.17.1-0.20231229211518-4dc2fd0334e8 h1:VepY9bmvruPnqryHY7YrtNdKJPCVkE2f4mpCqMpS8oQ= -github.com/dolthub/go-mysql-server v0.17.1-0.20231229211518-4dc2fd0334e8/go.mod h1:sMn7PQPkwZ2ZNic9146aoNRFR87js4V/q414UIta+ks= -github.com/dolthub/go-mysql-server v0.17.1-0.20231230163952-c73d4befb061 h1:7aSxCwqLvOjYQ7vQOouJedkdT8ClZAQlyCiaH/8jqNQ= -github.com/dolthub/go-mysql-server v0.17.1-0.20231230163952-c73d4befb061/go.mod h1:sMn7PQPkwZ2ZNic9146aoNRFR87js4V/q414UIta+ks= github.com/dolthub/go-mysql-server v0.17.1-0.20240102004327-8814e66a2544 h1:VhMewBcV6VAIkE88Muo/gmAKrtD12NjBweDoNRSIj3Q= github.com/dolthub/go-mysql-server v0.17.1-0.20240102004327-8814e66a2544/go.mod h1:sMn7PQPkwZ2ZNic9146aoNRFR87js4V/q414UIta+ks= github.com/dolthub/ishell v0.0.0-20221214210346-d7db0b066488 h1:0HHu0GWJH0N6a6keStrHhUAK5/o9LVfkh44pvsV4514= diff --git a/go/libraries/doltcore/merge/fulltext_table.go b/go/libraries/doltcore/merge/fulltext_table.go index 0fea5ac1c1..711eed79dd 100644 --- a/go/libraries/doltcore/merge/fulltext_table.go +++ b/go/libraries/doltcore/merge/fulltext_table.go @@ -16,7 +16,6 @@ package merge import ( "fmt" - "github.com/dolthub/dolt/go/store/prolly/tree" "io" "github.com/dolthub/go-mysql-server/memory" @@ -28,6 +27,7 @@ import ( "github.com/dolthub/dolt/go/libraries/doltcore/schema" "github.com/dolthub/dolt/go/libraries/doltcore/sqle/sqlutil" "github.com/dolthub/dolt/go/store/pool" + "github.com/dolthub/dolt/go/store/prolly/tree" "github.com/dolthub/dolt/go/store/val" ) diff --git a/go/libraries/doltcore/merge/merge_prolly_rows.go b/go/libraries/doltcore/merge/merge_prolly_rows.go index a8dc4f51f6..b412783b52 100644 --- a/go/libraries/doltcore/merge/merge_prolly_rows.go +++ b/go/libraries/doltcore/merge/merge_prolly_rows.go @@ -20,6 +20,15 @@ import ( "encoding/json" "errors" "fmt" + "io" + + "github.com/dolthub/go-mysql-server/sql" + "github.com/dolthub/go-mysql-server/sql/expression" + "github.com/dolthub/go-mysql-server/sql/transform" + "github.com/dolthub/go-mysql-server/sql/types" + "golang.org/x/exp/maps" + errorkinds "gopkg.in/src-d/go-errors.v1" + "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" "github.com/dolthub/dolt/go/libraries/doltcore/doltdb/durable" "github.com/dolthub/dolt/go/libraries/doltcore/schema" @@ -30,13 +39,6 @@ import ( "github.com/dolthub/dolt/go/store/prolly" "github.com/dolthub/dolt/go/store/prolly/tree" "github.com/dolthub/dolt/go/store/val" - "github.com/dolthub/go-mysql-server/sql" - "github.com/dolthub/go-mysql-server/sql/expression" - "github.com/dolthub/go-mysql-server/sql/transform" - "github.com/dolthub/go-mysql-server/sql/types" - "golang.org/x/exp/maps" - errorkinds "gopkg.in/src-d/go-errors.v1" - "io" ) // ErrUnableToMergeColumnDefaultValue is returned when a column's default value cannot be Eval'ed and we are unable to diff --git a/go/libraries/doltcore/merge/three_way_json_differ.go b/go/libraries/doltcore/merge/three_way_json_differ.go index 8fe5ed86ee..5134444b10 100644 --- a/go/libraries/doltcore/merge/three_way_json_differ.go +++ b/go/libraries/doltcore/merge/three_way_json_differ.go @@ -16,10 +16,12 @@ package merge import ( "bytes" - "github.com/dolthub/dolt/go/store/prolly/tree" - "github.com/dolthub/go-mysql-server/sql/types" "io" "strings" + + "github.com/dolthub/go-mysql-server/sql/types" + + "github.com/dolthub/dolt/go/store/prolly/tree" ) type ThreeWayJsonDiffer struct { diff --git a/go/libraries/doltcore/sqle/dsess/autoincrement_tracker.go b/go/libraries/doltcore/sqle/dsess/autoincrement_tracker.go old mode 100755 new mode 100644 index 1880f04b74..1d712b14b2 --- a/go/libraries/doltcore/sqle/dsess/autoincrement_tracker.go +++ b/go/libraries/doltcore/sqle/dsess/autoincrement_tracker.go @@ -16,7 +16,6 @@ package dsess import ( "context" - "github.com/dolthub/dolt/go/store/prolly/tree" "io" "math" "strings" @@ -30,6 +29,7 @@ import ( "github.com/dolthub/dolt/go/libraries/doltcore/ref" "github.com/dolthub/dolt/go/libraries/doltcore/schema" "github.com/dolthub/dolt/go/libraries/doltcore/sqle/globalstate" + "github.com/dolthub/dolt/go/store/prolly/tree" "github.com/dolthub/dolt/go/store/types" ) diff --git a/go/libraries/doltcore/sqle/dtables/conflicts_tables_prolly.go b/go/libraries/doltcore/sqle/dtables/conflicts_tables_prolly.go index 0ce0a7aee3..57aa2c175e 100644 --- a/go/libraries/doltcore/sqle/dtables/conflicts_tables_prolly.go +++ b/go/libraries/doltcore/sqle/dtables/conflicts_tables_prolly.go @@ -18,6 +18,7 @@ import ( "context" "encoding/base64" "fmt" + "github.com/dolthub/go-mysql-server/sql" "github.com/zeebo/xxh3" diff --git a/go/libraries/doltcore/sqle/dtables/constraint_violations_prolly.go b/go/libraries/doltcore/sqle/dtables/constraint_violations_prolly.go index cd7c007212..f48c2b280f 100644 --- a/go/libraries/doltcore/sqle/dtables/constraint_violations_prolly.go +++ b/go/libraries/doltcore/sqle/dtables/constraint_violations_prolly.go @@ -16,6 +16,7 @@ package dtables import ( "encoding/json" + "github.com/dolthub/go-mysql-server/sql" "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" diff --git a/go/libraries/doltcore/sqle/dtables/prolly_row_conv.go b/go/libraries/doltcore/sqle/dtables/prolly_row_conv.go index 741dc3046a..d0f5714ccb 100644 --- a/go/libraries/doltcore/sqle/dtables/prolly_row_conv.go +++ b/go/libraries/doltcore/sqle/dtables/prolly_row_conv.go @@ -16,6 +16,7 @@ package dtables import ( "context" + "github.com/dolthub/go-mysql-server/sql" "github.com/dolthub/dolt/go/libraries/doltcore/rowconv" diff --git a/go/libraries/doltcore/sqle/stats/rebuild_test.go b/go/libraries/doltcore/sqle/stats/rebuild_test.go index 6a070874c4..c5946a03eb 100644 --- a/go/libraries/doltcore/sqle/stats/rebuild_test.go +++ b/go/libraries/doltcore/sqle/stats/rebuild_test.go @@ -18,7 +18,6 @@ import ( "container/heap" "context" "fmt" - "github.com/dolthub/dolt/go/store/prolly/tree" "testing" "github.com/dolthub/go-mysql-server/sql" @@ -26,6 +25,7 @@ import ( "github.com/stretchr/testify/require" "github.com/dolthub/dolt/go/store/pool" + "github.com/dolthub/dolt/go/store/prolly/tree" "github.com/dolthub/dolt/go/store/val" ) diff --git a/go/libraries/doltcore/sqle/testutil.go b/go/libraries/doltcore/sqle/testutil.go index 8eebbf8270..52af039bf2 100644 --- a/go/libraries/doltcore/sqle/testutil.go +++ b/go/libraries/doltcore/sqle/testutil.go @@ -18,7 +18,6 @@ import ( "context" "errors" "fmt" - "github.com/dolthub/dolt/go/store/prolly/tree" "io" "strings" @@ -37,6 +36,7 @@ import ( "github.com/dolthub/dolt/go/libraries/doltcore/table/editor" config2 "github.com/dolthub/dolt/go/libraries/utils/config" "github.com/dolthub/dolt/go/libraries/utils/filesys" + "github.com/dolthub/dolt/go/store/prolly/tree" "github.com/dolthub/dolt/go/store/types" "github.com/dolthub/dolt/go/store/val" ) diff --git a/go/libraries/doltcore/sqle/writer/prolly_fk_indexer.go b/go/libraries/doltcore/sqle/writer/prolly_fk_indexer.go index 1df8ecd26a..cc12ed8984 100644 --- a/go/libraries/doltcore/sqle/writer/prolly_fk_indexer.go +++ b/go/libraries/doltcore/sqle/writer/prolly_fk_indexer.go @@ -16,13 +16,13 @@ package writer import ( "fmt" - "github.com/dolthub/dolt/go/store/prolly/tree" "io" "github.com/dolthub/go-mysql-server/sql" "github.com/dolthub/dolt/go/libraries/doltcore/sqle/index" "github.com/dolthub/dolt/go/store/prolly" + "github.com/dolthub/dolt/go/store/prolly/tree" "github.com/dolthub/dolt/go/store/val" ) diff --git a/go/libraries/doltcore/sqle/writer/prolly_index_writer.go b/go/libraries/doltcore/sqle/writer/prolly_index_writer.go index 2fdf84d605..f02189560a 100644 --- a/go/libraries/doltcore/sqle/writer/prolly_index_writer.go +++ b/go/libraries/doltcore/sqle/writer/prolly_index_writer.go @@ -16,7 +16,6 @@ package writer import ( "context" - "github.com/dolthub/dolt/go/store/prolly/tree" "io" "strings" @@ -26,6 +25,7 @@ import ( "github.com/dolthub/dolt/go/libraries/doltcore/doltdb/durable" "github.com/dolthub/dolt/go/libraries/doltcore/schema" "github.com/dolthub/dolt/go/store/prolly" + "github.com/dolthub/dolt/go/store/prolly/tree" "github.com/dolthub/dolt/go/store/val" ) diff --git a/go/libraries/doltcore/sqle/writer/prolly_index_writer_keyless.go b/go/libraries/doltcore/sqle/writer/prolly_index_writer_keyless.go index 43ad2b6cb1..783704e761 100644 --- a/go/libraries/doltcore/sqle/writer/prolly_index_writer_keyless.go +++ b/go/libraries/doltcore/sqle/writer/prolly_index_writer_keyless.go @@ -16,12 +16,12 @@ package writer import ( "context" - "github.com/dolthub/dolt/go/store/prolly/tree" "io" "github.com/dolthub/go-mysql-server/sql" "github.com/dolthub/dolt/go/store/prolly" + "github.com/dolthub/dolt/go/store/prolly/tree" "github.com/dolthub/dolt/go/store/val" ) diff --git a/go/store/prolly/tree/json_diff.go b/go/store/prolly/tree/json_diff.go index 439848f47c..a383c2cdd4 100644 --- a/go/store/prolly/tree/json_diff.go +++ b/go/store/prolly/tree/json_diff.go @@ -17,10 +17,11 @@ package tree import ( "bytes" "fmt" - "github.com/dolthub/go-mysql-server/sql/types" "io" "reflect" "strings" + + "github.com/dolthub/go-mysql-server/sql/types" ) type JsonDiff struct { diff --git a/go/store/prolly/tree/json_diff_test.go b/go/store/prolly/tree/json_diff_test.go index f635a77ab1..dac2d44503 100644 --- a/go/store/prolly/tree/json_diff_test.go +++ b/go/store/prolly/tree/json_diff_test.go @@ -1,11 +1,12 @@ package tree import ( + "io" + "testing" + "github.com/dolthub/go-mysql-server/sql/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "io" - "testing" ) // Copyright 2023 Dolthub, Inc. diff --git a/go/store/prolly/tree/node.go b/go/store/prolly/tree/node.go index a1149ac69a..6213fbe363 100644 --- a/go/store/prolly/tree/node.go +++ b/go/store/prolly/tree/node.go @@ -18,9 +18,10 @@ import ( "context" "encoding/hex" "fmt" - "github.com/dolthub/dolt/go/libraries/doltcore/schema" "io" + "github.com/dolthub/dolt/go/libraries/doltcore/schema" + "github.com/dolthub/dolt/go/gen/fb/serial" "github.com/dolthub/dolt/go/store/hash" "github.com/dolthub/dolt/go/store/prolly/message"