de-virtualize redundantly virtual Item method

vuvova · vuvova · commit 5ad36aa3b8cb · 2020-09-10T13:32:27.000+02:00
and remove a couple of useless MY_TEST's
diff --git a/sql/item.h b/sql/item.h
@@ -2392,7 +2392,7 @@ class Item: public Value_source,
     if (join_tab_idx_arg < join_tab_idx)
       join_tab_idx= join_tab_idx_arg;
   }
-  virtual uint get_join_tab_idx() { return join_tab_idx; }
+  uint get_join_tab_idx() const { return join_tab_idx; }
 
   table_map view_used_tables(TABLE_LIST *view)
   {
diff --git a/sql/opt_index_cond_pushdown.cc b/sql/opt_index_cond_pushdown.cc
@@ -206,7 +206,7 @@ static Item *make_cond_for_index(THD *thd, Item *cond, TABLE *table, uint keyno,
 	  new_cond->argument_list()->push_back(fix, thd->mem_root);
           used_tables|= fix->used_tables();
         }
-        if (MY_TEST(item->marker == ICP_COND_USES_INDEX_ONLY))
+        if (item->marker == ICP_COND_USES_INDEX_ONLY)
         {
           n_marked++;
           item->marker= 0;
@@ -239,7 +239,7 @@ static Item *make_cond_for_index(THD *thd, Item *cond, TABLE *table, uint keyno,
 	if (!fix)
 	  return (COND*) 0;
 	new_cond->argument_list()->push_back(fix, thd->mem_root);
-        if (MY_TEST(item->marker == ICP_COND_USES_INDEX_ONLY))
+        if (item->marker == ICP_COND_USES_INDEX_ONLY)
         {
           n_marked++;
           item->marker= 0;

Original file line number	Diff line number	Diff line change
`@@ -2392,7 +2392,7 @@ class Item: public Value_source,`
`2392`	`2392`	`if (join_tab_idx_arg < join_tab_idx)`
`2393`	`2393`	`join_tab_idx= join_tab_idx_arg;`
`2394`	`2394`	`}`
`2395`		`- virtual uint get_join_tab_idx() { return join_tab_idx; }`
	`2395`	`+ uint get_join_tab_idx() const { return join_tab_idx; }`
`2396`	`2396`
`2397`	`2397`	`table_map view_used_tables(TABLE_LIST *view)`
`2398`	`2398`	`{`
Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,7 @@ static Item make_cond_for_index(THD thd, Item cond, TABLE table, uint keyno,`
`206`	`206`	`new_cond->argument_list()->push_back(fix, thd->mem_root);`
`207`	`207`	`used_tables\|= fix->used_tables();`
`208`	`208`	`}`
`209`		`- if (MY_TEST(item->marker == ICP_COND_USES_INDEX_ONLY))`
	`209`	`+ if (item->marker == ICP_COND_USES_INDEX_ONLY)`
`210`	`210`	`{`
`211`	`211`	`n_marked++;`
`212`	`212`	`item->marker= 0;`
`@@ -239,7 +239,7 @@ static Item make_cond_for_index(THD thd, Item cond, TABLE table, uint keyno,`
`239`	`239`	`if (!fix)`
`240`	`240`	`return (COND*) 0;`
`241`	`241`	`new_cond->argument_list()->push_back(fix, thd->mem_root);`
`242`		`- if (MY_TEST(item->marker == ICP_COND_USES_INDEX_ONLY))`
	`242`	`+ if (item->marker == ICP_COND_USES_INDEX_ONLY)`
`243`	`243`	`{`
`244`	`244`	`n_marked++;`
`245`	`245`	`item->marker= 0;`