[ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/upda…

…te.sh
dolthub · Jul 10, 2024 · 921e758 · 921e758
1 parent c50e5b8
commit 921e758
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 11 deletions.
diff --git a/go/cmd/dolt/commands/engine/sqlengine.go b/go/cmd/dolt/commands/engine/sqlengine.go
@@ -17,7 +17,6 @@ package engine
 import (
 	"context"
 	"fmt"
-	rowexec2 "github.com/dolthub/dolt/go/libraries/doltcore/sqle/rowexec"
 	"os"
 	"runtime"
 	"strconv"
@@ -44,6 +43,7 @@ import (
 	"github.com/dolthub/dolt/go/libraries/doltcore/sqle/cluster"
 	"github.com/dolthub/dolt/go/libraries/doltcore/sqle/dsess"
 	"github.com/dolthub/dolt/go/libraries/doltcore/sqle/mysql_file_handler"
+	rowexec2 "github.com/dolthub/dolt/go/libraries/doltcore/sqle/rowexec"
 	"github.com/dolthub/dolt/go/libraries/doltcore/sqle/statsnoms"
 	"github.com/dolthub/dolt/go/libraries/doltcore/sqle/statspro"
 	"github.com/dolthub/dolt/go/libraries/doltcore/sqle/writer"

diff --git a/go/go.sum b/go/go.sum
@@ -183,8 +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.18.2-0.20240709213513-10da4b7827b8 h1:skM9LFf+j1fvYAS9XWqRE4FXw8ZZMxr1PPiHekHt1Vw=
-github.com/dolthub/go-mysql-server v0.18.2-0.20240709213513-10da4b7827b8/go.mod h1:4MeRDuamwwn09jSdygeK3x5hk257JVWkvQi7Fror9Xw=
 github.com/dolthub/go-mysql-server v0.18.2-0.20240710145501-f122d3461495 h1:r92Y2wZrAz2YFr2KQ/PP6nUacl1La0YEIo2mT+D9Ui4=
 github.com/dolthub/go-mysql-server v0.18.2-0.20240710145501-f122d3461495/go.mod h1:4MeRDuamwwn09jSdygeK3x5hk257JVWkvQi7Fror9Xw=
 github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 h1:OAsXLAPL4du6tfbBgK0xXHZkOlos63RdKYS3Sgw/dfI=

diff --git a/go/libraries/doltcore/sqle/enginetest/dolt_harness.go b/go/libraries/doltcore/sqle/enginetest/dolt_harness.go
@@ -17,8 +17,6 @@ package enginetest
 import (
 	"context"
 	"fmt"
-	rowexec2 "github.com/dolthub/dolt/go/libraries/doltcore/sqle/rowexec"
-	"github.com/dolthub/go-mysql-server/sql/rowexec"
 	"runtime"
 	"strings"
 	"testing"
@@ -29,13 +27,15 @@ import (
 	"github.com/dolthub/go-mysql-server/memory"
 	"github.com/dolthub/go-mysql-server/sql"
 	"github.com/dolthub/go-mysql-server/sql/mysql_db"
+	"github.com/dolthub/go-mysql-server/sql/rowexec"
 	"github.com/stretchr/testify/require"
 
 	"github.com/dolthub/dolt/go/libraries/doltcore/branch_control"
 	"github.com/dolthub/dolt/go/libraries/doltcore/dtestutils"
 	"github.com/dolthub/dolt/go/libraries/doltcore/env"
 	"github.com/dolthub/dolt/go/libraries/doltcore/sqle"
 	"github.com/dolthub/dolt/go/libraries/doltcore/sqle/dsess"
+	rowexec2 "github.com/dolthub/dolt/go/libraries/doltcore/sqle/rowexec"
 	"github.com/dolthub/dolt/go/libraries/doltcore/sqle/statsnoms"
 	"github.com/dolthub/dolt/go/libraries/doltcore/sqle/statspro"
 	"github.com/dolthub/dolt/go/libraries/doltcore/sqle/writer"

diff --git a/go/libraries/doltcore/sqle/index/secondary_iter.go b/go/libraries/doltcore/sqle/index/secondary_iter.go
@@ -16,11 +16,12 @@ package index
 
 import (
 	"context"
+	"io"
+
 	"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"
-	"io"
 )
 
 type SecondaryLookupIter interface {

diff --git a/go/libraries/doltcore/sqle/rowexec/builder.go b/go/libraries/doltcore/sqle/rowexec/builder.go
@@ -16,6 +16,10 @@ package rowexec
 
 import (
 	"context"
+
+	"github.com/dolthub/go-mysql-server/sql"
+	"github.com/dolthub/go-mysql-server/sql/plan"
+
 	"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"
@@ -24,8 +28,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/plan"
 )
 
 type Builder struct{}

diff --git a/go/libraries/doltcore/sqle/rowexec/lookup_join.go b/go/libraries/doltcore/sqle/rowexec/lookup_join.go
@@ -16,14 +16,14 @@ package rowexec
 
 import (
 	"context"
-	"github.com/dolthub/dolt/go/libraries/doltcore/sqle/index"
-	"github.com/dolthub/dolt/go/store/pool"
 	"io"
 
 	"github.com/dolthub/go-mysql-server/sql"
 	"github.com/dolthub/go-mysql-server/sql/expression"
 
 	"github.com/dolthub/dolt/go/libraries/doltcore/schema"
+	"github.com/dolthub/dolt/go/libraries/doltcore/sqle/index"
+	"github.com/dolthub/dolt/go/store/pool"
 	"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/tuple_range.go b/go/store/prolly/tuple_range.go
@@ -15,10 +15,11 @@
 package prolly
 
 import (
-	"github.com/shopspring/decimal"
 	"math"
 	"sort"
 
+	"github.com/shopspring/decimal"
+
 	"github.com/dolthub/dolt/go/store/pool"
 	"github.com/dolthub/dolt/go/store/prolly/tree"
 	"github.com/dolthub/dolt/go/store/val"