Merge branch 'max/dolt-row-exec' of github.com:dolthub/dolt into max/…

…dolt-row-exec
dolthub · Jul 15, 2024 · 425b421 · 425b421
2 parents 85ff8b4 + bf6fdbb
commit 425b421
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
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.20240712142621-13bb86505b50 h1:JDrcym5N65k3yMBEXD30UI/H0aiosPNUatQ3eg0b5LM=
-github.com/dolthub/go-mysql-server v0.18.2-0.20240712142621-13bb86505b50/go.mod h1:P6bG0p+3mH4LS4DLo3BySh10ZJTDqgWyfWBu8gGE3eU=
 github.com/dolthub/go-mysql-server v0.18.2-0.20240712185834-193a67ce1c37 h1:SG4z3QORBkjXXMsiJvGMAWcZq1WSqO5l1+LqwG9kC+s=
 github.com/dolthub/go-mysql-server v0.18.2-0.20240712185834-193a67ce1c37/go.mod h1:P6bG0p+3mH4LS4DLo3BySh10ZJTDqgWyfWBu8gGE3eU=
 github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 h1:OAsXLAPL4du6tfbBgK0xXHZkOlos63RdKYS3Sgw/dfI=

diff --git a/go/libraries/doltcore/sqle/rowexec/lookup_join_test.go b/go/libraries/doltcore/sqle/rowexec/lookup_join_test.go
@@ -16,15 +16,17 @@ package rowexec
 
 import (
 	"context"
-	"github.com/dolthub/dolt/go/libraries/doltcore/dtestutils"
-	"github.com/dolthub/dolt/go/libraries/doltcore/sqle"
-	"github.com/dolthub/dolt/go/libraries/doltcore/table/editor"
+	"testing"
+
 	"github.com/dolthub/go-mysql-server/sql"
 	"github.com/dolthub/go-mysql-server/sql/plan"
 	"github.com/dolthub/go-mysql-server/sql/planbuilder"
 	"github.com/dolthub/go-mysql-server/sql/transform"
 	"github.com/stretchr/testify/require"
-	"testing"
+
+	"github.com/dolthub/dolt/go/libraries/doltcore/dtestutils"
+	"github.com/dolthub/dolt/go/libraries/doltcore/sqle"
+	"github.com/dolthub/dolt/go/libraries/doltcore/table/editor"
 )
 
 // TestLookupJoin ensures that we trigger the operator replacement for