Merge branch 'main' into max/stats-iter-change

Author: max-hoffman

enginetest/join_planning_tests.go

@@ -43,11 +43,13 @@ type JoinPlanTest struct {
 	skipOld bool
 }
 
-var JoinPlanningTests = []struct {
+type joinPlanScript struct {
 	name  string
 	setup []string
 	tests []JoinPlanTest
-}{
+}
+
+var JoinPlanningTests = []joinPlanScript{
 	{
 		name: "filter pushdown through join uppercase name",
 		setup: []string{
@@ -78,6 +80,43 @@ var JoinPlanningTests = []struct {
 			},
 		},
 	},
+	{
+		name: "block merge join",
+		setup: []string{
+			"CREATE table xy (x int primary key, y int, unique index y_idx(y));",
+			"CREATE table ab (a int primary key, b int);",
+			"insert into xy values (1,0), (2,1), (0,2), (3,3);",
+			"insert into ab values (0,2), (1,2), (2,2), (3,1);",
+			`analyze table xy update histogram on x using data '{"row_count":1000000}'`,
+			`analyze table ab update histogram on a using data '{"row_count":1000000}'`,
+		},
+		tests: []JoinPlanTest{
+			{
+				q:     "select /*+ JOIN_ORDER(ab, xy) MERGE_JOIN(ab, xy)*/ * from ab join xy on y = a order by 1, 3",
+				types: []plan.JoinType{plan.JoinTypeMerge},
+				exp:   []sql.Row{{0, 2, 1, 0}, {1, 2, 2, 1}, {2, 2, 0, 2}, {3, 1, 3, 3}},
+			},
+			{
+				q:     "select * from ab join xy on x = a and y = a order by 1, 3",
+				types: []plan.JoinType{plan.JoinTypeMerge},
+				exp:   []sql.Row{{3, 1, 3, 3}},
+			},
+			{
+				q:   "set @@SESSION.disable_merge_join = 1",
+				exp: []sql.Row{{}},
+			},
+			{
+				q:     "select /*+ JOIN_ORDER(ab, xy) MERGE_JOIN(ab, xy)*/ * from ab join xy on y = a order by 1, 3",
+				types: []plan.JoinType{plan.JoinTypeLookup},
+				exp:   []sql.Row{{0, 2, 1, 0}, {1, 2, 2, 1}, {2, 2, 0, 2}, {3, 1, 3, 3}},
+			},
+			{
+				q:     "select * from ab join xy on x = a and y = a order by 1, 3",
+				types: []plan.JoinType{plan.JoinTypeLookup},
+				exp:   []sql.Row{{3, 1, 3, 3}},
+			},
+		},
+	},
 	{
 		name: "merge join unary index",
 		setup: []string{
@@ -1725,8 +1764,17 @@ join uv d on d.u = c.x`,
 }
 
 func TestJoinPlanning(t *testing.T, harness Harness) {
-	for _, tt := range JoinPlanningTests {
+	runJoinPlanningTests(t, harness, JoinPlanningTests)
+}
+
+func runJoinPlanningTests(t *testing.T, harness Harness, tests []joinPlanScript) {
+	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+			if sh, ok := harness.(SkippingHarness); ok {
+				if sh.SkipQueryTest(tt.name) {
+					t.Skip(tt.name)
+				}
+			}
 			harness.Setup([]setup.SetupScript{setup.MydbData[0], tt.setup})
 			e := mustNewEngine(t, harness)
 			defer e.Close()
@@ -1750,7 +1798,6 @@ func TestJoinPlanning(t *testing.T, harness Harness) {
 		})
 	}
 }
-
 func evalJoinTypeTest(t *testing.T, harness Harness, e QueryEngine, query string, types []plan.JoinType, skipOld bool) {
 	t.Run(query+" join types", func(t *testing.T) {
 		if skipOld {

enginetest/join_stats_tests.go

@@ -135,12 +135,8 @@ var JoinStatTests = []struct {
 			{
 				// b is smallest table, bxc is smallest b-connected join
 				// due to b < 0 filter and positive c skew
-				q:     "select /*+ LEFT_DEEP */  count(*) from u0 b join `u-15` a on a.b = b.b join `u+15` c on a.b = c.b where b.b < -2",
-				order: [][]string{{"b", "c", "a"}},
-			},
-			{
 				q:     "select /*+ LEFT_DEEP */ count(*) from u0 b join `u-15` a on a.b = b.b join `u+15` c on a.b = c.b where b.b < -2",
-				order: [][]string{{"b", "c", "a"}},
+				order: [][]string{{"b", "c", "a"}, {"a", "c", "b"}},
 			},
 			{
 				// b is smallest table, bxa is smallest b-connected join

enginetest/memory_engine_test.go

@@ -111,7 +111,11 @@ func TestLateralJoin(t *testing.T) {
 
 // TestJoinPlanning runs join-specific tests for merge
 func TestJoinPlanning(t *testing.T) {
-	enginetest.TestJoinPlanning(t, enginetest.NewDefaultMemoryHarness())
+	harness := enginetest.NewDefaultMemoryHarness()
+	if harness.IsUsingServer() {
+		harness.QueriesToSkip("block merge join")
+	}
+	enginetest.TestJoinPlanning(t, harness)
 }
 
 // TestJoinOps runs join-specific tests for merge

enginetest/queries/imdb_plans.go

@@ -3,7 +3,7 @@ module github.com/dolthub/go-mysql-server
 require (
 	github.com/cespare/xxhash/v2 v2.2.0
 	github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2
-	github.com/dolthub/go-icu-regex v0.0.0-20250303123116-549b8d7cad00
+	github.com/dolthub/go-icu-regex v0.0.0-20250319212010-451ea8d003fa
 	github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71
 	github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81
 	github.com/dolthub/vitess v0.0.0-20250304211657-920ca9ec2b9a

enginetest/queries/integration_plans.go

@@ -54,6 +54,8 @@ github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2 h1:u3PMzfF8RkKd3lB9pZ2bfn0qEG+1G
 github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2/go.mod h1:mIEZOHnFx4ZMQeawhw9rhsj+0zwQj7adVsnBX7t+eKY=
 github.com/dolthub/go-icu-regex v0.0.0-20250303123116-549b8d7cad00 h1:rh2ij2yTYKJWlX+c8XRg4H5OzqPewbU1lPK8pcfVmx8=
 github.com/dolthub/go-icu-regex v0.0.0-20250303123116-549b8d7cad00/go.mod h1:ylU4XjUpsMcvl/BKeRRMXSH7e7WBrPXdSLvnRJYrxEA=
+github.com/dolthub/go-icu-regex v0.0.0-20250319212010-451ea8d003fa h1:NFbzJ4wjWRz32nz2EimbrHpRx1Xt6k+IaR8N+j4x62k=
+github.com/dolthub/go-icu-regex v0.0.0-20250319212010-451ea8d003fa/go.mod h1:ylU4XjUpsMcvl/BKeRRMXSH7e7WBrPXdSLvnRJYrxEA=
 github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71 h1:bMGS25NWAGTEtT5tOBsCuCrlYnLRKpbJVJkDbrTRhwQ=
 github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71/go.mod h1:2/2zjLQ/JOOSbbSboojeg+cAwcRV0fDLzIiWch/lhqI=
 github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81 h1:7/v8q9XGFa6q5Ap4Z/OhNkAMBaK5YeuEzwJt+NZdhiE=

go.mod

@@ -494,6 +494,10 @@ func (s *idxScope) visitSelf(n sql.Node) error {
 			newCheck.Expr = newE
 			s.checks = append(s.checks, &newCheck)
 		}
+		for _, r := range n.Returning {
+			newE := fixExprToScope(r, dstScope)
+			s.expressions = append(s.expressions, newE)
+		}
 	case *plan.Update:
 		newScope := s.copy()
 		srcScope := s.childScopes[0]
@@ -543,7 +547,8 @@ func (s *idxScope) finalizeSelf(n sql.Node) (sql.Node, error) {
 		nn := *n
 		nn.Source = s.children[0]
 		nn.Destination = s.children[1]
-		nn.OnDupExprs = s.expressions
+		nn.OnDupExprs = s.expressions[:len(n.OnDupExprs)]
+		nn.Returning = s.expressions[len(n.OnDupExprs):]
 		return nn.WithChecks(s.checks), nil
 	default:
 		s.ids = columnIdsForNode(n)

go.sum

@@ -200,6 +200,7 @@ func replanJoin(ctx *sql.Context, n *plan.JoinNode, a *Analyzer, scope *plan.Sco
 		return nil, err
 	}
 
+	m.SetDefaultHints()
 	hints := memo.ExtractJoinHint(n)
 	for _, h := range hints {
 		// this should probably happen earlier, but the root is not

sql/analyzer/fix_exec_indexes.go

@@ -0,0 +1,29 @@
+// Copyright 2025 Dolthub, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package function
+
+import (
+	regex "github.com/dolthub/go-icu-regex"
+	"github.com/sirupsen/logrus"
+)
+
+func init() {
+	// By default, the dolthub/go-icu-regex package will panic if a regex object is
+	// finalized without having the Dispose() method called. Instead of panicing, we
+	// add a RegexLeakHandler to log an error.
+	regex.SetRegexLeakHandler(func() {
+		logrus.Error("Detected leaked go-icu-regex.Regex instance")
+	})
+}