Skip to content

Commit 300f4ae

Browse files
qw4990ti-chi-bot
authored andcommitted
This is an automated cherry-pick of pingcap#53981
Signed-off-by: ti-chi-bot <[email protected]>
1 parent d97c194 commit 300f4ae

File tree

3 files changed

+474
-0
lines changed

3 files changed

+474
-0
lines changed

cmd/explaintest/r/explain_generate_column_substitute.result

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -600,6 +600,7 @@ begin;
600600
delete from t2 where c_decimal > c_double/2 order by c_int, c_str, c_double, c_decimal limit 1;
601601
desc format='brief' select t2.c_enum from t2,t1 where t1.c_int - 1 = t2.c_int - 1 order by t2.c_enum;
602602
id estRows task access object operator info
603+
<<<<<<< HEAD:cmd/explaintest/r/explain_generate_column_substitute.result
603604
Sort 12487.50 root test.t2.c_enum
604605
└─HashJoin 12487.50 root inner join, equal:[eq(minus(test.t1.c_int, 1), minus(test.t2.c_int, 1))]
605606
├─IndexReader(Build) 9990.00 root index:IndexFullScan
@@ -609,6 +610,17 @@ Sort 12487.50 root test.t2.c_enum
609610
└─Selection 8000.00 root not(isnull(minus(test.t2.c_int, 1)))
610611
└─TableReader 10000.00 root data:TableFullScan
611612
└─TableFullScan 10000.00 cop[tikv] table:t2 keep order:false, stats:pseudo
613+
=======
614+
Sort 10000.00 root explain_generate_column_substitute.t2.c_enum
615+
└─HashJoin 10000.00 root inner join, equal:[eq(minus(explain_generate_column_substitute.t1.c_int, 1), minus(explain_generate_column_substitute.t2.c_int, 1))]
616+
├─Selection(Build) 8000.00 root not(isnull(minus(explain_generate_column_substitute.t2.c_int, 1)))
617+
│ └─Projection 10000.00 root explain_generate_column_substitute.t2.c_enum, minus(explain_generate_column_substitute.t2.c_int, 1), explain_generate_column_substitute.t2._tidb_rowid
618+
│ └─UnionScan 10000.00 root
619+
│ └─TableReader 10000.00 root data:TableFullScan
620+
│ └─TableFullScan 10000.00 cop[tikv] table:t2 keep order:false, stats:pseudo
621+
└─IndexReader(Probe) 9990.00 root index:IndexFullScan
622+
└─IndexFullScan 9990.00 cop[tikv] table:t1, index:expression_index_2(`c_int` - 1) keep order:false, stats:pseudo
623+
>>>>>>> d53b34412f0 (planner: prevent pushing Projection with virtual columns down to UnionScan (#53981)):tests/integrationtest/r/explain_generate_column_substitute.result
612624
select t2.c_enum from t2,t1 where t1.c_int - 1 = t2.c_int - 1 order by t2.c_enum;
613625
c_enum
614626
orange

0 commit comments

Comments
 (0)