Skip to content

Commit

Permalink
fixup
Browse files Browse the repository at this point in the history
  • Loading branch information
@qw4990
qw4990 committed Oct 19, 2022
1 parent 18aa6d4 commit cc9a3c3
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 86 deletions.
116 changes: 38 additions & 78 deletions planner/core/testdata/integration_suite_out.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2588,33 +2588,33 @@
"SQL": "explain format = 'verbose' select count(*) from t1 join t2 on t1.a = t2.a",
"Plan": [
"StreamAgg_15 1.00 18.93 root funcs:count(1)->Column#7",
"└─TableReader_50 3.00 9.93 root data:ExchangeSender_49",
" └─ExchangeSender_49 3.00 195.38 mpp[tiflash] ExchangeType: PassThrough",
" └─HashJoin_46 3.00 195.38 mpp[tiflash] inner join, equal:[eq(test.t1.a, test.t2.a)]",
" ├─ExchangeReceiver_23(Build) 3.00 57.00 mpp[tiflash] ",
" │ └─ExchangeSender_22 3.00 54.00 mpp[tiflash] ExchangeType: Broadcast",
" │ └─Selection_21 3.00 54.00 mpp[tiflash] not(isnull(test.t1.a))",
" │ └─TableFullScan_20 3.00 45.00 mpp[tiflash] table:t1 keep order:false",
" └─Selection_25(Probe) 3.00 54.00 mpp[tiflash] not(isnull(test.t2.a))",
" └─TableFullScan_24 3.00 45.00 mpp[tiflash] table:t2 keep order:false"
"└─TableReader_47 3.00 9.93 root data:ExchangeSender_46",
" └─ExchangeSender_46 3.00 195.38 mpp[tiflash] ExchangeType: PassThrough",
" └─HashJoin_43 3.00 195.38 mpp[tiflash] inner join, equal:[eq(test.t1.a, test.t2.a)]",
" ├─ExchangeReceiver_22(Build) 3.00 57.00 mpp[tiflash] ",
" │ └─ExchangeSender_21 3.00 54.00 mpp[tiflash] ExchangeType: Broadcast",
" │ └─Selection_20 3.00 54.00 mpp[tiflash] not(isnull(test.t1.a))",
" │ └─TableFullScan_19 3.00 45.00 mpp[tiflash] table:t1 keep order:false",
" └─Selection_24(Probe) 3.00 54.00 mpp[tiflash] not(isnull(test.t2.a))",
" └─TableFullScan_23 3.00 45.00 mpp[tiflash] table:t2 keep order:false"
]
},
{
"SQL": "explain format = 'verbose' select count(*) from t1 join t2 on t1.a = t2.a join t3 on t1.b = t3.b",
"Plan": [
"StreamAgg_15 1.00 60.60 root funcs:count(1)->Column#10",
"└─HashJoin_66 3.00 51.60 root inner join, equal:[eq(test.t1.b, test.t3.b)]",
" ├─IndexReader_54(Build) 3.00 11.66 root index:IndexFullScan_53",
" │ └─IndexFullScan_53 3.00 130.50 cop[tikv] table:t3, index:c(b) keep order:false",
" └─TableReader_40(Probe) 3.00 11.14 root data:ExchangeSender_39",
" └─ExchangeSender_39 3.00 204.38 mpp[tiflash] ExchangeType: PassThrough",
" └─HashJoin_30 3.00 204.38 mpp[tiflash] inner join, equal:[eq(test.t1.a, test.t2.a)]",
" ├─ExchangeReceiver_36(Build) 3.00 66.00 mpp[tiflash] ",
" │ └─ExchangeSender_35 3.00 63.00 mpp[tiflash] ExchangeType: Broadcast",
" │ └─Selection_34 3.00 63.00 mpp[tiflash] not(isnull(test.t1.a)), not(isnull(test.t1.b))",
" │ └─TableFullScan_33 3.00 54.00 mpp[tiflash] table:t1 keep order:false",
" └─Selection_38(Probe) 3.00 54.00 mpp[tiflash] not(isnull(test.t2.a))",
" └─TableFullScan_37 3.00 45.00 mpp[tiflash] table:t2 keep order:false"
"└─HashJoin_65 3.00 51.60 root inner join, equal:[eq(test.t1.b, test.t3.b)]",
" ├─IndexReader_53(Build) 3.00 11.66 root index:IndexFullScan_52",
" │ └─IndexFullScan_52 3.00 130.50 cop[tikv] table:t3, index:c(b) keep order:false",
" └─TableReader_39(Probe) 3.00 11.14 root data:ExchangeSender_38",
" └─ExchangeSender_38 3.00 204.38 mpp[tiflash] ExchangeType: PassThrough",
" └─HashJoin_29 3.00 204.38 mpp[tiflash] inner join, equal:[eq(test.t1.a, test.t2.a)]",
" ├─ExchangeReceiver_35(Build) 3.00 66.00 mpp[tiflash] ",
" │ └─ExchangeSender_34 3.00 63.00 mpp[tiflash] ExchangeType: Broadcast",
" │ └─Selection_33 3.00 63.00 mpp[tiflash] not(isnull(test.t1.a)), not(isnull(test.t1.b))",
" │ └─TableFullScan_32 3.00 54.00 mpp[tiflash] table:t1 keep order:false",
" └─Selection_37(Probe) 3.00 54.00 mpp[tiflash] not(isnull(test.t2.a))",
" └─TableFullScan_36 3.00 45.00 mpp[tiflash] table:t2 keep order:false"
]
},
{
Expand Down Expand Up @@ -2642,15 +2642,15 @@
"SQL": "explain format = 'verbose' select /*+ merge_join(t1) */ count(*) from t1 join t2 on t1.a = t2.a",
"Plan": [
"StreamAgg_14 1.00 59.65 root funcs:count(1)->Column#7",
"└─MergeJoin_34 3.00 50.65 root inner join, left key:test.t1.a, right key:test.t2.a",
" ├─Sort_31(Build) 3.00 20.83 root test.t2.a",
" │ └─TableReader_30 3.00 6.56 root data:Selection_29",
" │ └─Selection_29 3.00 54.00 cop[tiflash] not(isnull(test.t2.a))",
" │ └─TableFullScan_28 3.00 45.00 cop[tiflash] table:t2 keep order:false",
" └─Sort_24(Probe) 3.00 20.83 root test.t1.a",
" └─TableReader_23 3.00 6.56 root data:Selection_22",
" └─Selection_22 3.00 54.00 cop[tiflash] not(isnull(test.t1.a))",
" └─TableFullScan_21 3.00 45.00 cop[tiflash] table:t1 keep order:false"
"└─MergeJoin_32 3.00 50.65 root inner join, left key:test.t1.a, right key:test.t2.a",
" ├─Sort_30(Build) 3.00 20.83 root test.t2.a",
" │ └─TableReader_29 3.00 6.56 root data:Selection_28",
" │ └─Selection_28 3.00 54.00 cop[tiflash] not(isnull(test.t2.a))",
" │ └─TableFullScan_27 3.00 45.00 cop[tiflash] table:t2 keep order:false",
" └─Sort_23(Probe) 3.00 20.83 root test.t1.a",
" └─TableReader_22 3.00 6.56 root data:Selection_21",
" └─Selection_21 3.00 54.00 cop[tiflash] not(isnull(test.t1.a))",
" └─TableFullScan_20 3.00 45.00 cop[tiflash] table:t1 keep order:false"
]
}
]
Expand Down Expand Up @@ -3330,10 +3330,7 @@
" │ └─TableFullScan 10000.00 mpp[tiflash] table:t keep order:false, stats:pseudo",
" └─TableFullScan(Probe) 10000.00 mpp[tiflash] table:t1 keep order:false, stats:pseudo"
],
"Warn": [
"MPP mode may be blocked because `Cartesian Product` is only supported by broadcast join, check value and documents of variables `tidb_broadcast_join_threshold_size` and `tidb_broadcast_join_threshold_count`.",
"MPP mode may be blocked because `Cartesian Product` is only supported by broadcast join, check value and documents of variables `tidb_broadcast_join_threshold_size` and `tidb_broadcast_join_threshold_count`."
]
"Warn": null
},
{
"SQL": "explain format = 'brief' select * from test.t t1 where t1.a>1 or t1.a in (select b from test.t where b<t1.b);",
Expand All @@ -3348,10 +3345,7 @@
" │ └─TableFullScan 10000.00 mpp[tiflash] table:t keep order:false, stats:pseudo",
" └─TableFullScan(Probe) 10000.00 mpp[tiflash] table:t1 keep order:false, stats:pseudo"
],
"Warn": [
"MPP mode may be blocked because `Cartesian Product` is only supported by broadcast join, check value and documents of variables `tidb_broadcast_join_threshold_size` and `tidb_broadcast_join_threshold_count`.",
"MPP mode may be blocked because `Cartesian Product` is only supported by broadcast join, check value and documents of variables `tidb_broadcast_join_threshold_size` and `tidb_broadcast_join_threshold_count`."
]
"Warn": null
},
{
"SQL": "explain format = 'brief' select * from test.t t1 where t1.a>1 or t1.b not in (select a from test.t); -- cartesian left anti",
Expand All @@ -3366,10 +3360,7 @@
" │ └─TableFullScan 10000.00 mpp[tiflash] table:t keep order:false, stats:pseudo",
" └─TableFullScan(Probe) 10000.00 mpp[tiflash] table:t1 keep order:false, stats:pseudo"
],
"Warn": [
"MPP mode may be blocked because `Cartesian Product` is only supported by broadcast join, check value and documents of variables `tidb_broadcast_join_threshold_size` and `tidb_broadcast_join_threshold_count`.",
"MPP mode may be blocked because `Cartesian Product` is only supported by broadcast join, check value and documents of variables `tidb_broadcast_join_threshold_size` and `tidb_broadcast_join_threshold_count`."
]
"Warn": null
},
{
"SQL": "explain format = 'brief' select * from test.t t1 where t1.a>1 or t1.b not in (select a from test.t where b<t1.b);",
Expand All @@ -3384,10 +3375,7 @@
" │ └─TableFullScan 10000.00 mpp[tiflash] table:t keep order:false, stats:pseudo",
" └─TableFullScan(Probe) 10000.00 mpp[tiflash] table:t1 keep order:false, stats:pseudo"
],
"Warn": [
"MPP mode may be blocked because `Cartesian Product` is only supported by broadcast join, check value and documents of variables `tidb_broadcast_join_threshold_size` and `tidb_broadcast_join_threshold_count`.",
"MPP mode may be blocked because `Cartesian Product` is only supported by broadcast join, check value and documents of variables `tidb_broadcast_join_threshold_size` and `tidb_broadcast_join_threshold_count`."
]
"Warn": null
},
{
"SQL": "explain format = 'brief' select a in (select a from test.t), a not in (select a from test.t) from test.t; -- semi join as scalar",
Expand Down Expand Up @@ -3423,12 +3411,7 @@
" │ └─TableFullScan 10000.00 mpp[tiflash] table:t keep order:false, stats:pseudo",
" └─TableFullScan(Probe) 10000.00 mpp[tiflash] table:t keep order:false, stats:pseudo"
],
"Warn": [
"MPP mode may be blocked because `Cartesian Product` is only supported by broadcast join, check value and documents of variables `tidb_broadcast_join_threshold_size` and `tidb_broadcast_join_threshold_count`.",
"MPP mode may be blocked because `Cartesian Product` is only supported by broadcast join, check value and documents of variables `tidb_broadcast_join_threshold_size` and `tidb_broadcast_join_threshold_count`.",
"MPP mode may be blocked because `Cartesian Product` is only supported by broadcast join, check value and documents of variables `tidb_broadcast_join_threshold_size` and `tidb_broadcast_join_threshold_count`.",
"MPP mode may be blocked because `Cartesian Product` is only supported by broadcast join, check value and documents of variables `tidb_broadcast_join_threshold_size` and `tidb_broadcast_join_threshold_count`."
]
"Warn": null
},
{
"SQL": "explain format = 'brief' select b in (select a from test.t), b not in (select a from test.t) from test.t;",
Expand All @@ -3446,12 +3429,7 @@
" │ └─TableFullScan 10000.00 mpp[tiflash] table:t keep order:false, stats:pseudo",
" └─TableFullScan(Probe) 10000.00 mpp[tiflash] table:t keep order:false, stats:pseudo"
],
"Warn": [
"MPP mode may be blocked because `Cartesian Product` is only supported by broadcast join, check value and documents of variables `tidb_broadcast_join_threshold_size` and `tidb_broadcast_join_threshold_count`.",
"MPP mode may be blocked because `Cartesian Product` is only supported by broadcast join, check value and documents of variables `tidb_broadcast_join_threshold_size` and `tidb_broadcast_join_threshold_count`.",
"MPP mode may be blocked because `Cartesian Product` is only supported by broadcast join, check value and documents of variables `tidb_broadcast_join_threshold_size` and `tidb_broadcast_join_threshold_count`.",
"MPP mode may be blocked because `Cartesian Product` is only supported by broadcast join, check value and documents of variables `tidb_broadcast_join_threshold_size` and `tidb_broadcast_join_threshold_count`."
]
"Warn": null
},
{
"SQL": "explain format = 'brief' select b in (select b from test.t), b not in (select b from test.t) from test.t;",
Expand All @@ -3469,12 +3447,7 @@
" │ └─TableFullScan 10000.00 mpp[tiflash] table:t keep order:false, stats:pseudo",
" └─TableFullScan(Probe) 10000.00 mpp[tiflash] table:t keep order:false, stats:pseudo"
],
"Warn": [
"MPP mode may be blocked because `Cartesian Product` is only supported by broadcast join, check value and documents of variables `tidb_broadcast_join_threshold_size` and `tidb_broadcast_join_threshold_count`.",
"MPP mode may be blocked because `Cartesian Product` is only supported by broadcast join, check value and documents of variables `tidb_broadcast_join_threshold_size` and `tidb_broadcast_join_threshold_count`.",
"MPP mode may be blocked because `Cartesian Product` is only supported by broadcast join, check value and documents of variables `tidb_broadcast_join_threshold_size` and `tidb_broadcast_join_threshold_count`.",
"MPP mode may be blocked because `Cartesian Product` is only supported by broadcast join, check value and documents of variables `tidb_broadcast_join_threshold_size` and `tidb_broadcast_join_threshold_count`."
]
"Warn": null
},
{
"SQL": "explain format = 'brief' select a, b, a in (select a from test.t), a in (select b from test.t), b in (select a from test.t), b in (select b from test.t), a not in (select a from test.t), a not in (select b from test.t), b not in (select a from test.t), b not in (select b from test.t) from test.t;",
Expand Down Expand Up @@ -3515,20 +3488,7 @@
" │ └─TableFullScan 10000.00 mpp[tiflash] table:t keep order:false, stats:pseudo",
" └─TableFullScan(Probe) 10000.00 mpp[tiflash] table:t keep order:false, stats:pseudo"
],
"Warn": [
"MPP mode may be blocked because `Cartesian Product` is only supported by broadcast join, check value and documents of variables `tidb_broadcast_join_threshold_size` and `tidb_broadcast_join_threshold_count`.",
"MPP mode may be blocked because `Cartesian Product` is only supported by broadcast join, check value and documents of variables `tidb_broadcast_join_threshold_size` and `tidb_broadcast_join_threshold_count`.",
"MPP mode may be blocked because `Cartesian Product` is only supported by broadcast join, check value and documents of variables `tidb_broadcast_join_threshold_size` and `tidb_broadcast_join_threshold_count`.",
"MPP mode may be blocked because `Cartesian Product` is only supported by broadcast join, check value and documents of variables `tidb_broadcast_join_threshold_size` and `tidb_broadcast_join_threshold_count`.",
"MPP mode may be blocked because `Cartesian Product` is only supported by broadcast join, check value and documents of variables `tidb_broadcast_join_threshold_size` and `tidb_broadcast_join_threshold_count`.",
"MPP mode may be blocked because `Cartesian Product` is only supported by broadcast join, check value and documents of variables `tidb_broadcast_join_threshold_size` and `tidb_broadcast_join_threshold_count`.",
"MPP mode may be blocked because `Cartesian Product` is only supported by broadcast join, check value and documents of variables `tidb_broadcast_join_threshold_size` and `tidb_broadcast_join_threshold_count`.",
"MPP mode may be blocked because `Cartesian Product` is only supported by broadcast join, check value and documents of variables `tidb_broadcast_join_threshold_size` and `tidb_broadcast_join_threshold_count`.",
"MPP mode may be blocked because `Cartesian Product` is only supported by broadcast join, check value and documents of variables `tidb_broadcast_join_threshold_size` and `tidb_broadcast_join_threshold_count`.",
"MPP mode may be blocked because `Cartesian Product` is only supported by broadcast join, check value and documents of variables `tidb_broadcast_join_threshold_size` and `tidb_broadcast_join_threshold_count`.",
"MPP mode may be blocked because `Cartesian Product` is only supported by broadcast join, check value and documents of variables `tidb_broadcast_join_threshold_size` and `tidb_broadcast_join_threshold_count`.",
"MPP mode may be blocked because `Cartesian Product` is only supported by broadcast join, check value and documents of variables `tidb_broadcast_join_threshold_size` and `tidb_broadcast_join_threshold_count`."
]
"Warn": null
}
]
},
Expand Down
10 changes: 2 additions & 8 deletions planner/core/testdata/join_reorder_suite_out.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5519,10 +5519,7 @@
" └─Selection(Probe) 9990.00 mpp[tiflash] not(isnull(test.t1.a))",
" └─TableFullScan 10000.00 mpp[tiflash] table:t1 keep order:false, stats:pseudo"
],
"Warning": [
"Warning 1105 MPP mode may be blocked because `Cartesian Product` is only supported by broadcast join, check value and documents of variables `tidb_broadcast_join_threshold_size` and `tidb_broadcast_join_threshold_count`.",
"Warning 1105 MPP mode may be blocked because `Cartesian Product` is only supported by broadcast join, check value and documents of variables `tidb_broadcast_join_threshold_size` and `tidb_broadcast_join_threshold_count`."
]
"Warning": null
},
{
"SQL": "select /*+ leading(t1, t2) */ * from t4 join t on t4.a=t.a left join t1 on t.a = t1.a join t2 on t.b = t2.b join t3 on t2.b=t3.b;",
Expand Down Expand Up @@ -6205,10 +6202,7 @@
" └─Selection(Probe) 9990.00 mpp[tiflash] not(isnull(test.t4.b))",
" └─TableFullScan 10000.00 mpp[tiflash] table:t4 keep order:false, stats:pseudo"
],
"Warning": [
"Warning 1105 MPP mode may be blocked because `Cartesian Product` is only supported by broadcast join, check value and documents of variables `tidb_broadcast_join_threshold_size` and `tidb_broadcast_join_threshold_count`.",
"Warning 1105 MPP mode may be blocked because `Cartesian Product` is only supported by broadcast join, check value and documents of variables `tidb_broadcast_join_threshold_size` and `tidb_broadcast_join_threshold_count`."
]
"Warning": null
}
]
},
Expand Down

0 comments on commit cc9a3c3

Please sign in to comment.