From bd706809e9be6e7356fd4aa381c075230dff8f48 Mon Sep 17 00:00:00 2001 From: Kenan Yao Date: Mon, 16 Nov 2020 17:24:08 +0800 Subject: [PATCH] ast: fix Restore for INL_HASH_JOIN / INL_MERGE_JOIN hints (#1091) --- ast/misc.go | 2 +- ast/misc_test.go | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ast/misc.go b/ast/misc.go index 66260e931..ba4e35f6e 100755 --- a/ast/misc.go +++ b/ast/misc.go @@ -2565,7 +2565,7 @@ func (n *TableOptimizerHint) Restore(ctx *format.RestoreCtx) error { switch n.HintName.L { case "max_execution_time": ctx.WritePlainf("%d", n.HintData.(uint64)) - case "tidb_hj", "tidb_smj", "tidb_inlj", "hash_join", "merge_join", "inl_join", "broadcast_join", "broadcast_join_local": + case "tidb_hj", "tidb_smj", "tidb_inlj", "hash_join", "merge_join", "inl_join", "broadcast_join", "broadcast_join_local", "inl_hash_join", "inl_merge_join": for i, table := range n.Tables { if i != 0 { ctx.WritePlain(", ") diff --git a/ast/misc_test.go b/ast/misc_test.go index a6a289592..061e4a471 100644 --- a/ast/misc_test.go +++ b/ast/misc_test.go @@ -232,6 +232,8 @@ func (ts *testMiscSuite) TestTableOptimizerHintRestore(c *C) { {"TIDB_HJ(t1@sel1,t2@sel2)", "TIDB_HJ(`t1`@`sel1`, `t2`@`sel2`)"}, {"MERGE_JOIN(t1,t2)", "MERGE_JOIN(`t1`, `t2`)"}, {"BROADCAST_JOIN(t1,t2)", "BROADCAST_JOIN(`t1`, `t2`)"}, + {"INL_HASH_JOIN(t1,t2)", "INL_HASH_JOIN(`t1`, `t2`)"}, + {"INL_MERGE_JOIN(t1,t2)", "INL_MERGE_JOIN(`t1`, `t2`)"}, {"INL_JOIN(t1,t2)", "INL_JOIN(`t1`, `t2`)"}, {"HASH_JOIN(t1,t2)", "HASH_JOIN(`t1`, `t2`)"}, {"MAX_EXECUTION_TIME(3000)", "MAX_EXECUTION_TIME(3000)"},