MDEV-21510: Add index name to block chosen_access_method

bsrikanth-mariadb · bsrikanth-mariadb · commit cd65ef5c8357 · 2025-04-27T15:01:30.000-04:00
diff --git a/mysql-test/main/opt_trace.result b/mysql-test/main/opt_trace.result
@@ -1288,7 +1288,8 @@ explain select * from t1,t2 where t1.a=t2.b+2 and t2.a= t1.b	{
                             "rows_read": 1,
                             "rows_out": 1,
                             "cost": 0.1821659,
-                            "uses_join_buffering": false
+                            "uses_join_buffering": false,
+                            "index": "a"
                           }
                         }
                       }
@@ -1343,7 +1344,8 @@ explain select * from t1,t2 where t1.a=t2.b+2 and t2.a= t1.b	{
                             "rows_read": 1,
                             "rows_out": 1,
                             "cost": 0.1821659,
-                            "uses_join_buffering": false
+                            "uses_join_buffering": false,
+                            "index": "a"
                           }
                         }
                       }
@@ -2536,7 +2538,8 @@ explain  select * from t1 where a=1 and b=2 order by c limit 1	{
                         "rows_read": 41,
                         "rows_out": 41,
                         "cost": 0.051379171,
-                        "uses_join_buffering": false
+                        "uses_join_buffering": false,
+                        "index": "a_b"
                       }
                     }
                   }
@@ -3015,7 +3018,8 @@ explain select * from t1 left join t2 on t2.a=t1.a	{
                             "rows_read": 1,
                             "rows_out": 1,
                             "cost": 0.007120904,
-                            "uses_join_buffering": false
+                            "uses_join_buffering": false,
+                            "index": "PRIMARY"
                           }
                         }
                       }
@@ -3983,7 +3987,8 @@ explain select * from t1 where pk = 2 and a=5 and b=1	{
                         "rows_read": 1,
                         "rows_out": 1,
                         "cost": 0.000928812,
-                        "uses_join_buffering": false
+                        "uses_join_buffering": false,
+                        "index": "pk_a_b"
                       }
                     }
                   }
@@ -4679,7 +4684,8 @@ explain delete t0,t1 from t0, t1 where t0.a=t1.a and t1.a<3	{
                         "rows_read": 3,
                         "rows_out": 3,
                         "cost": 0.001755494,
-                        "uses_join_buffering": false
+                        "uses_join_buffering": false,
+                        "index": "a"
                       }
                     }
                   },
@@ -4705,7 +4711,8 @@ explain delete t0,t1 from t0, t1 where t0.a=t1.a and t1.a<3	{
                         "rows_read": 3,
                         "rows_out": 3,
                         "cost": 0.001755494,
-                        "uses_join_buffering": false
+                        "uses_join_buffering": false,
+                        "index": "a"
                       }
                     }
                   }
@@ -4747,7 +4754,8 @@ explain delete t0,t1 from t0, t1 where t0.a=t1.a and t1.a<3	{
                             "rows_read": 1,
                             "rows_out": 1,
                             "cost": 0.002376836,
-                            "uses_join_buffering": false
+                            "uses_join_buffering": false,
+                            "index": "a"
                           }
                         }
                       }
@@ -4798,7 +4806,8 @@ explain delete t0,t1 from t0, t1 where t0.a=t1.a and t1.a<3	{
                             "rows_read": 1.166666667,
                             "rows_out": 1.166666667,
                             "cost": 0.002392836,
-                            "uses_join_buffering": false
+                            "uses_join_buffering": false,
+                            "index": "a"
                           }
                         }
                       }
@@ -11278,7 +11287,8 @@ JS
                                     "rows_read": 1,
                                     "rows_out": 1,
                                     "cost": 0.01901531,
-                                    "uses_join_buffering": false
+                                    "uses_join_buffering": false,
+                                    "index": "b"
                                 }
                             }
                         }
@@ -11524,7 +11534,8 @@ JS
                                     "rows_read": 1,
                                     "rows_out": 1,
                                     "cost": 0.01840091,
-                                    "uses_join_buffering": false
+                                    "uses_join_buffering": false,
+                                    "index": "a"
                                 }
                             }
                         }
@@ -12909,7 +12920,8 @@ json_detailed(json_extract(trace, '$**.choose_best_splitting'))
                                         "rows_read": 1.8367,
                                         "rows_out": 1.8367,
                                         "cost": 0.002051185,
-                                        "uses_join_buffering": false
+                                        "uses_join_buffering": false,
+                                        "index": "idx_a"
                                     }
                                 }
                             }
@@ -13205,6 +13217,7 @@ explain select * from t1 where a<10 and b between 10 and 50 and c < 10	{
                         "rows_out": 0.017766,
                         "cost": 0.006364199,
                         "uses_join_buffering": false,
+                        "index": "a",
                         "rowid_filter_index": "b"
                       }
                     }
diff --git a/mysql-test/main/opt_trace_index_merge_innodb.result b/mysql-test/main/opt_trace_index_merge_innodb.result
@@ -230,7 +230,8 @@ explain select * from t1 where pk1 != 0  and key1 = 1	{
                         "rows_read": 1,
                         "rows_out": 1,
                         "cost": 0.00345856,
-                        "uses_join_buffering": false
+                        "uses_join_buffering": false,
+                        "index": "key1"
                       }
                     }
                   }
diff --git a/mysql-test/main/opt_trace_selectivity.result b/mysql-test/main/opt_trace_selectivity.result
@@ -189,7 +189,8 @@ JS
                         "rows_read": 6,
                         "rows_out": 0.6,
                         "cost": 0.005388489,
-                        "uses_join_buffering": false
+                        "uses_join_buffering": false,
+                        "index": "a"
                     }
                 }
             }
diff --git a/mysql-test/main/selectivity_innodb_notembedded.result b/mysql-test/main/selectivity_innodb_notembedded.result
@@ -301,7 +301,8 @@ JS
             "rows_read": 5,
             "rows_out": 2.490196078,
             "cost": 0.00948507,
-            "uses_join_buffering": false
+            "uses_join_buffering": false,
+            "index": "PRIMARY"
         }
     }
 ]
diff --git a/mysql-test/main/selectivity_notembedded.result b/mysql-test/main/selectivity_notembedded.result
@@ -296,7 +296,8 @@ JS
             "rows_read": 5,
             "rows_out": 2.490196078,
             "cost": 0.010014472,
-            "uses_join_buffering": false
+            "uses_join_buffering": false,
+            "index": "PRIMARY"
         }
     }
 ]
diff --git a/sql/opt_trace.cc b/sql/opt_trace.cc
@@ -712,12 +712,26 @@ void print_best_access_for_table(THD *thd, POSITION *pos)
   DBUG_ASSERT(thd->trace_started());
 
   Json_writer_object obj(thd, "chosen_access_method");
-  obj.
-    add("type", pos->type == JT_ALL ? "scan" : join_type_str[pos->type]).
-    add("rows_read", pos->records_read).
-    add("rows_out", pos->records_out).
-    add("cost", pos->read_time).
-    add("uses_join_buffering", pos->use_join_buffer);
+
+  obj.add("type", pos->type == JT_ALL ? "scan" : join_type_str[pos->type]);
+
+  if (pos->type == JT_EQ_REF || pos->type == JT_REF ||
+      pos->type == JT_MAYBE_REF || pos->type == JT_FT)
+  {
+    obj.add("index", pos->key->table->key_info[pos->key->key].name);
+  }
+
+  if (pos->type == JT_RANGE)
+  {
+    obj.add("index",
+            pos->table->table->key_info[pos->table->quick->index].name);
+  }
+
+  obj.add("rows_read", pos->records_read)
+      .add("rows_out", pos->records_out)
+      .add("cost", pos->read_time)
+      .add("uses_join_buffering", pos->use_join_buffer);
+
   if (pos->range_rowid_filter_info)
   {
     uint key_no= pos->range_rowid_filter_info->get_key_no();

Original file line number	Diff line number	Diff line change
`@@ -1288,7 +1288,8 @@ explain select * from t1,t2 where t1.a=t2.b+2 and t2.a= t1.b {`
`1288`	`1288`	`"rows_read": 1,`
`1289`	`1289`	`"rows_out": 1,`
`1290`	`1290`	`"cost": 0.1821659,`
`1291`		`- "uses_join_buffering": false`
	`1291`	`+ "uses_join_buffering": false,`
	`1292`	`+ "index": "a"`
`1292`	`1293`	`}`
`1293`	`1294`	`}`
`1294`	`1295`	`}`
`@@ -1343,7 +1344,8 @@ explain select * from t1,t2 where t1.a=t2.b+2 and t2.a= t1.b {`
`1343`	`1344`	`"rows_read": 1,`
`1344`	`1345`	`"rows_out": 1,`
`1345`	`1346`	`"cost": 0.1821659,`
`1346`		`- "uses_join_buffering": false`
	`1347`	`+ "uses_join_buffering": false,`
	`1348`	`+ "index": "a"`
`1347`	`1349`	`}`
`1348`	`1350`	`}`
`1349`	`1351`	`}`
`@@ -2536,7 +2538,8 @@ explain select * from t1 where a=1 and b=2 order by c limit 1 {`
`2536`	`2538`	`"rows_read": 41,`
`2537`	`2539`	`"rows_out": 41,`
`2538`	`2540`	`"cost": 0.051379171,`
`2539`		`- "uses_join_buffering": false`
	`2541`	`+ "uses_join_buffering": false,`
	`2542`	`+ "index": "a_b"`
`2540`	`2543`	`}`
`2541`	`2544`	`}`
`2542`	`2545`	`}`
`@@ -3015,7 +3018,8 @@ explain select * from t1 left join t2 on t2.a=t1.a {`
`3015`	`3018`	`"rows_read": 1,`
`3016`	`3019`	`"rows_out": 1,`
`3017`	`3020`	`"cost": 0.007120904,`
`3018`		`- "uses_join_buffering": false`
	`3021`	`+ "uses_join_buffering": false,`
	`3022`	`+ "index": "PRIMARY"`
`3019`	`3023`	`}`
`3020`	`3024`	`}`
`3021`	`3025`	`}`
`@@ -3983,7 +3987,8 @@ explain select * from t1 where pk = 2 and a=5 and b=1 {`
`3983`	`3987`	`"rows_read": 1,`
`3984`	`3988`	`"rows_out": 1,`
`3985`	`3989`	`"cost": 0.000928812,`
`3986`		`- "uses_join_buffering": false`
	`3990`	`+ "uses_join_buffering": false,`
	`3991`	`+ "index": "pk_a_b"`
`3987`	`3992`	`}`
`3988`	`3993`	`}`
`3989`	`3994`	`}`
`@@ -4679,7 +4684,8 @@ explain delete t0,t1 from t0, t1 where t0.a=t1.a and t1.a<3 {`
`4679`	`4684`	`"rows_read": 3,`
`4680`	`4685`	`"rows_out": 3,`
`4681`	`4686`	`"cost": 0.001755494,`
`4682`		`- "uses_join_buffering": false`
	`4687`	`+ "uses_join_buffering": false,`
	`4688`	`+ "index": "a"`
`4683`	`4689`	`}`
`4684`	`4690`	`}`
`4685`	`4691`	`},`
`@@ -4705,7 +4711,8 @@ explain delete t0,t1 from t0, t1 where t0.a=t1.a and t1.a<3 {`
`4705`	`4711`	`"rows_read": 3,`
`4706`	`4712`	`"rows_out": 3,`
`4707`	`4713`	`"cost": 0.001755494,`
`4708`		`- "uses_join_buffering": false`
	`4714`	`+ "uses_join_buffering": false,`
	`4715`	`+ "index": "a"`
`4709`	`4716`	`}`
`4710`	`4717`	`}`
`4711`	`4718`	`}`
`@@ -4747,7 +4754,8 @@ explain delete t0,t1 from t0, t1 where t0.a=t1.a and t1.a<3 {`
`4747`	`4754`	`"rows_read": 1,`
`4748`	`4755`	`"rows_out": 1,`
`4749`	`4756`	`"cost": 0.002376836,`
`4750`		`- "uses_join_buffering": false`
	`4757`	`+ "uses_join_buffering": false,`
	`4758`	`+ "index": "a"`
`4751`	`4759`	`}`
`4752`	`4760`	`}`
`4753`	`4761`	`}`
`@@ -4798,7 +4806,8 @@ explain delete t0,t1 from t0, t1 where t0.a=t1.a and t1.a<3 {`
`4798`	`4806`	`"rows_read": 1.166666667,`
`4799`	`4807`	`"rows_out": 1.166666667,`
`4800`	`4808`	`"cost": 0.002392836,`
`4801`		`- "uses_join_buffering": false`
	`4809`	`+ "uses_join_buffering": false,`
	`4810`	`+ "index": "a"`
`4802`	`4811`	`}`
`4803`	`4812`	`}`
`4804`	`4813`	`}`
`@@ -11278,7 +11287,8 @@ JS`
`11278`	`11287`	`"rows_read": 1,`
`11279`	`11288`	`"rows_out": 1,`
`11280`	`11289`	`"cost": 0.01901531,`
`11281`		`- "uses_join_buffering": false`
	`11290`	`+ "uses_join_buffering": false,`
	`11291`	`+ "index": "b"`
`11282`	`11292`	`}`
`11283`	`11293`	`}`
`11284`	`11294`	`}`
`@@ -11524,7 +11534,8 @@ JS`
`11524`	`11534`	`"rows_read": 1,`
`11525`	`11535`	`"rows_out": 1,`
`11526`	`11536`	`"cost": 0.01840091,`
`11527`		`- "uses_join_buffering": false`
	`11537`	`+ "uses_join_buffering": false,`
	`11538`	`+ "index": "a"`
`11528`	`11539`	`}`
`11529`	`11540`	`}`
`11530`	`11541`	`}`
`@@ -12909,7 +12920,8 @@ json_detailed(json_extract(trace, '$**.choose_best_splitting'))`
`12909`	`12920`	`"rows_read": 1.8367,`
`12910`	`12921`	`"rows_out": 1.8367,`
`12911`	`12922`	`"cost": 0.002051185,`
`12912`		`- "uses_join_buffering": false`
	`12923`	`+ "uses_join_buffering": false,`
	`12924`	`+ "index": "idx_a"`
`12913`	`12925`	`}`
`12914`	`12926`	`}`
`12915`	`12927`	`}`
`@@ -13205,6 +13217,7 @@ explain select * from t1 where a<10 and b between 10 and 50 and c < 10 {`
`13205`	`13217`	`"rows_out": 0.017766,`
`13206`	`13218`	`"cost": 0.006364199,`
`13207`	`13219`	`"uses_join_buffering": false,`
	`13220`	`+ "index": "a",`
`13208`	`13221`	`"rowid_filter_index": "b"`
`13209`	`13222`	`}`
`13210`	`13223`	`}`
Original file line number	Diff line number	Diff line change
`@@ -230,7 +230,8 @@ explain select * from t1 where pk1 != 0 and key1 = 1 {`
`230`	`230`	`"rows_read": 1,`
`231`	`231`	`"rows_out": 1,`
`232`	`232`	`"cost": 0.00345856,`
`233`		`- "uses_join_buffering": false`
	`233`	`+ "uses_join_buffering": false,`
	`234`	`+ "index": "key1"`
`234`	`235`	`}`
`235`	`236`	`}`
`236`	`237`	`}`
Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,8 @@ JS`
`189`	`189`	`"rows_read": 6,`
`190`	`190`	`"rows_out": 0.6,`
`191`	`191`	`"cost": 0.005388489,`
`192`		`- "uses_join_buffering": false`
	`192`	`+ "uses_join_buffering": false,`
	`193`	`+ "index": "a"`
`193`	`194`	`}`
`194`	`195`	`}`
`195`	`196`	`}`
Original file line number	Diff line number	Diff line change
`@@ -301,7 +301,8 @@ JS`
`301`	`301`	`"rows_read": 5,`
`302`	`302`	`"rows_out": 2.490196078,`
`303`	`303`	`"cost": 0.00948507,`
`304`		`- "uses_join_buffering": false`
	`304`	`+ "uses_join_buffering": false,`
	`305`	`+ "index": "PRIMARY"`
`305`	`306`	`}`
`306`	`307`	`}`
`307`	`308`	`]`
Original file line number	Diff line number	Diff line change
`@@ -296,7 +296,8 @@ JS`
`296`	`296`	`"rows_read": 5,`
`297`	`297`	`"rows_out": 2.490196078,`
`298`	`298`	`"cost": 0.010014472,`
`299`		`- "uses_join_buffering": false`
	`299`	`+ "uses_join_buffering": false,`
	`300`	`+ "index": "PRIMARY"`
`300`	`301`	`}`
`301`	`302`	`}`
`302`	`303`	`]`