Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

planner: missed order by item for index merge sometimes #46576

Merged
merged 1 commit into from
Sep 1, 2023
Merged

planner: missed order by item for index merge sometimes #46576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions planner/core/find_best_task.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1351,6 +1351,13 @@ func (ds *DataSource) convertToPartialIndexScan(prop *property.PhysicalProperty,
is := ds.getOriginalPhysicalIndexScan(prop, path, matchProp, false)
// TODO: Consider using isIndexCoveringColumns() to avoid another TableRead
indexConds := path.IndexFilters
if matchProp {
if is.Table.GetPartitionInfo() != nil && !is.Index.Global && is.SCtx().GetSessionVars().StmtCtx.UseDynamicPartitionPrune() {
is.Columns, is.schema, _ = AddExtraPhysTblIDColumn(is.SCtx(), is.Columns, is.schema)
}
// Add sort items for index scan for merge-sort operation between partitions.
is.ByItems = byItems
}
if len(indexConds) > 0 {
var selectivity float64
if path.CountAfterAccess > 0 {
Expand All @@ -1366,13 +1373,6 @@ func (ds *DataSource) convertToPartialIndexScan(prop *property.PhysicalProperty,
indexPlan.SetChildren(is)
return indexPlan
}
if matchProp {
if is.Table.GetPartitionInfo() != nil && !is.Index.Global && is.SCtx().GetSessionVars().StmtCtx.UseDynamicPartitionPrune() {
is.Columns, is.schema, _ = AddExtraPhysTblIDColumn(is.SCtx(), is.Columns, is.schema)
}
// Add sort items for index scan for merge-sort operation between partitions.
is.ByItems = byItems
}
indexPlan = is
return indexPlan
}
Expand All @@ -1398,6 +1398,12 @@ func (ds *DataSource) convertToPartialTableScan(prop *property.PhysicalProperty,
}
}
ts.filterCondition = newFilterConds
if matchProp {
if ts.Table.GetPartitionInfo() != nil && ts.SCtx().GetSessionVars().StmtCtx.UseDynamicPartitionPrune() {
ts.Columns, ts.schema, _ = AddExtraPhysTblIDColumn(ts.SCtx(), ts.Columns, ts.schema)
}
ts.ByItems = byItems
}
if len(ts.filterCondition) > 0 {
selectivity, _, err := cardinality.Selectivity(ds.SCtx(), ds.tableStats.HistColl, ts.filterCondition, nil)
if err != nil {
Expand All @@ -1408,12 +1414,6 @@ func (ds *DataSource) convertToPartialTableScan(prop *property.PhysicalProperty,
tablePlan.SetChildren(ts)
return tablePlan
}
if matchProp {
if ts.Table.GetPartitionInfo() != nil && ts.SCtx().GetSessionVars().StmtCtx.UseDynamicPartitionPrune() {
ts.Columns, ts.schema, _ = AddExtraPhysTblIDColumn(ts.SCtx(), ts.Columns, ts.schema)
}
ts.ByItems = byItems
}
tablePlan = ts
return tablePlan
}
Expand Down
2 changes: 1 addition & 1 deletion planner/core/issuetest/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ go_test(
data = glob(["testdata/**"]),
flaky = True,
race = "on",
shard_count = 9,
shard_count = 10,
deps = [
"//parser",
"//planner",
Expand Down
14 changes: 14 additions & 0 deletions planner/core/issuetest/planner_issue_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,3 +198,17 @@ func TestIssue46083(t *testing.T) {
tk.MustExec("CREATE TEMPORARY TABLE v0(v1 int)")
tk.MustExec("INSERT INTO v0 WITH ta2 AS (TABLE v0) TABLE ta2 FOR UPDATE OF ta2;")
}

func TestIssue46005(t *testing.T) {
store := testkit.CreateMockStore(t)
tk := testkit.NewTestKit(t, store)
tk.MustExec("use test")
tk.MustExec("create table tbl_39(col_239 year(4) not null default '2009', primary key(col_239), unique key idx_223(col_239), key idx_224(col_239))")
tk.MustExec("insert into tbl_39 values (1994),(1995),(1996),(1997)")
tk.HasPlan(
"select /*+ use_index_merge( tbl_39) */ col_239 from tbl_39 where not( tbl_39.col_239 not in ( '1994' ) ) and tbl_39.col_239 not in ( '2004' , '2010' , '2010' ) or not( tbl_39.col_239 <= '1996' ) and not( tbl_39.col_239 between '2026' and '2011' ) order by tbl_39.col_239 limit 382",
"IndexMerge",
)
rs := tk.MustQuery("select /*+ use_index_merge( tbl_39) */ col_239 from tbl_39 where not( tbl_39.col_239 not in ( '1994' ) ) and tbl_39.col_239 not in ( '2004' , '2010' , '2010' ) or not( tbl_39.col_239 <= '1996' ) and not( tbl_39.col_239 between '2026' and '2011' ) order by tbl_39.col_239 limit 382")
rs.Check(testkit.Rows("1994", "1997"))
}