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

Jump to bottom

parser: support keep_order and no_keep_order hint #39965

Merged
merged 25 commits into from
Dec 21, 2022
Merged

parser: support keep_order and no_keep_order hint #39965

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
e4d8302
parser: support keep_order and no_keep_order hint
Reminiscent Dec 15, 2022
319b6dd
Merge branch 'master' into keep_order_hint
qw4990 Dec 19, 2022
943853b
Merge branch 'master' into keep_order_hint
ti-chi-bot Dec 20, 2022
ff8f21a
Merge branch 'master' into keep_order_hint
ti-chi-bot Dec 20, 2022
8c191f4
Merge branch 'master' into keep_order_hint
ti-chi-bot Dec 20, 2022
0bc921d
Merge branch 'master' into keep_order_hint
ti-chi-bot Dec 20, 2022
989a71a
Merge branch 'master' into keep_order_hint
ti-chi-bot Dec 20, 2022
6e806e3
Merge branch 'master' into keep_order_hint
ti-chi-bot Dec 20, 2022
3220276
Merge branch 'master' into keep_order_hint
ti-chi-bot Dec 20, 2022
e641ac6
Merge branch 'master' into keep_order_hint
ti-chi-bot Dec 20, 2022
38b710a
Merge branch 'master' into keep_order_hint
ti-chi-bot Dec 20, 2022
dcd6768
Merge branch 'master' into keep_order_hint
ti-chi-bot Dec 20, 2022
52b50ee
Merge branch 'master' into keep_order_hint
ti-chi-bot Dec 20, 2022
1a019fc
Merge branch 'master' into keep_order_hint
ti-chi-bot Dec 21, 2022
262f624
Merge branch 'master' into keep_order_hint
ti-chi-bot Dec 21, 2022
1fe5abe
Merge branch 'master' into keep_order_hint
ti-chi-bot Dec 21, 2022
e90295a
fix ut
Reminiscent Dec 21, 2022
646f2ce
Merge remote-tracking branch 'origin/keep_order_hint' into keep_order…
Reminiscent Dec 21, 2022
67ad106
Merge branch 'master' into keep_order_hint
ti-chi-bot Dec 21, 2022
1e72c00
Merge branch 'master' into keep_order_hint
Reminiscent Dec 21, 2022
3e46a3e
Merge branch 'master' into keep_order_hint
Reminiscent Dec 21, 2022
20673d9
Merge branch 'master' into keep_order_hint
ti-chi-bot Dec 21, 2022
c4c25a4
Merge branch 'master' into keep_order_hint
ti-chi-bot Dec 21, 2022
b8d47d1
Merge branch 'master' into keep_order_hint
ti-chi-bot Dec 21, 2022
7460687
Merge branch 'master' into keep_order_hint
ti-chi-bot Dec 21, 2022
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
2 changes: 1 addition & 1 deletion parser/ast/misc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3768,7 +3768,7 @@ func (n *TableOptimizerHint) Restore(ctx *format.RestoreCtx) error {
}
table.Restore(ctx)
}
case "use_index", "ignore_index", "use_index_merge", "force_index":
case "use_index", "ignore_index", "use_index_merge", "force_index", "keep_order", "no_keep_order":
n.Tables[0].Restore(ctx)
ctx.WritePlain(" ")
for i, index := range n.Indexes {
Expand Down
12 changes: 12 additions & 0 deletions parser/ast/misc_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,18 @@ func TestTableOptimizerHintRestore(t *testing.T) {
{"IGNORE_INDEX(@sel_1 t1 c1)", "IGNORE_INDEX(@`sel_1` `t1` `c1`)"},
{"IGNORE_INDEX(t1@sel_1 c1)", "IGNORE_INDEX(`t1`@`sel_1` `c1`)"},
{"IGNORE_INDEX(t1@sel_1 partition(p0, p1) c1)", "IGNORE_INDEX(`t1`@`sel_1` PARTITION(`p0`, `p1`) `c1`)"},
{"KEEP_ORDER(t1 c1)", "KEEP_ORDER(`t1` `c1`)"},
{"KEEP_ORDER(test.t1 c1)", "KEEP_ORDER(`test`.`t1` `c1`)"},
{"KEEP_ORDER(@sel_1 t1 c1)", "KEEP_ORDER(@`sel_1` `t1` `c1`)"},
{"KEEP_ORDER(t1@sel_1 c1)", "KEEP_ORDER(`t1`@`sel_1` `c1`)"},
{"KEEP_ORDER(test.t1@sel_1 c1)", "KEEP_ORDER(`test`.`t1`@`sel_1` `c1`)"},
{"KEEP_ORDER(test.t1@sel_1 partition(p0) c1)", "KEEP_ORDER(`test`.`t1`@`sel_1` PARTITION(`p0`) `c1`)"},
{"NO_KEEP_ORDER(t1 c1)", "NO_KEEP_ORDER(`t1` `c1`)"},
{"NO_KEEP_ORDER(test.t1 c1)", "NO_KEEP_ORDER(`test`.`t1` `c1`)"},
{"NO_KEEP_ORDER(@sel_1 t1 c1)", "NO_KEEP_ORDER(@`sel_1` `t1` `c1`)"},
{"NO_KEEP_ORDER(t1@sel_1 c1)", "NO_KEEP_ORDER(`t1`@`sel_1` `c1`)"},
{"NO_KEEP_ORDER(test.t1@sel_1 c1)", "NO_KEEP_ORDER(`test`.`t1`@`sel_1` `c1`)"},
{"NO_KEEP_ORDER(test.t1@sel_1 partition(p0) c1)", "NO_KEEP_ORDER(`test`.`t1`@`sel_1` PARTITION(`p0`) `c1`)"},
{"TIDB_SMJ(`t1`)", "TIDB_SMJ(`t1`)"},
{"TIDB_SMJ(t1)", "TIDB_SMJ(`t1`)"},
{"TIDB_SMJ(t1,t2)", "TIDB_SMJ(`t1`, `t2`)"},
Expand Down
Loading