Bug#35813111: Use C++ standard library for more bit operations

[TablesContainedIn, noclose]

The TablesContainedIn class provides iterators over qep_tab_map
bitmaps. The implementation is very similar to BitIteratorAdaptor used
by BitsSetIn() in bit_utils.h, only the latter is more general and
reusable.

Remove the TablesContainedIn class and instead use BitsSetIn().

Change-Id: I6e83686ebd56d2e86e7b6b582b84b2f1d9d51f14

Author: kahatlen

include/tables_contained_in.h

@@ -22,30 +22,21 @@
 
 #include "sql/iterators/hash_join_buffer.h"
 
-#include <assert.h>
-#include <cstddef>
-#include <cstring>
-#include <iterator>
-#include <new>
-#include <unordered_map>
-
-#include "field_types.h"
+#include <algorithm>
+#include <cstdint>
+#include <stdexcept>
+#include <utility>
+
 #include "my_alloc.h"
-#include "my_bitmap.h"
 #include "my_compiler.h"
-
 #include "my_inttypes.h"
-#include "mysql/strings/m_ctype.h"
-#include "sql/field.h"
-#include "sql/handler.h"
+#include "my_sys.h"
+#include "mysqld_error.h"
+#include "sql/current_thd.h"
 #include "sql/item_cmpfunc.h"
-#include "sql/join_optimizer/bit_utils.h"
 #include "sql/psi_memory_key.h"
 #include "sql/sql_class.h"
-#include "sql/sql_executor.h"
-#include "sql/sql_optimizer.h"
-#include "sql/table.h"
-#include "tables_contained_in.h"
+#include "sql/system_variables.h"
 #include "template_utils.h"
 
 using pack_rows::TableCollection;

sql/iterators/hash_join_buffer.cc

@@ -57,25 +57,20 @@
 /// for implementing hash join.
 
 #include <stddef.h>
-#include <stdint.h>
+#include <cassert>
 #include <memory>
+#include <string>
+#include <string_view>
 #include <vector>
 
 #include "extra/robin-hood-hashing/robin_hood.h"
-#include "field_types.h"
-#include "map_helpers.h"
 #include "my_alloc.h"
-#include "my_inttypes.h"
-#include "my_table_map.h"
-#include "prealloced_array.h"
 #include "sql/immutable_string.h"
 #include "sql/item_cmpfunc.h"
 #include "sql/pack_rows.h"
-#include "sql/table.h"
 #include "sql_string.h"
 
-class Field;
-class QEP_TAB;
+class THD;
 
 namespace hash_join_buffer {
 

sql/iterators/hash_join_buffer.h

@@ -38,15 +38,13 @@
 #include <cassert>
 #include <cmath>
 #include <cstddef>
-#include <iterator>
+#include <cstring>
 #include <memory>
 #include <string>
-#include <type_traits>
 #include <utility>
 #include <vector>
 
 #include "field_types.h"
-#include "lex_string.h"
 #include "mem_root_deque.h"
 #include "my_alloc.h"
 #include "my_base.h"
@@ -72,7 +70,8 @@
 #include "sql/item_cmpfunc.h"
 #include "sql/item_func.h"
 #include "sql/item_sum.h"  // Item_sum
-#include "sql/iterators/sorting_iterator.h"
+#include "sql/iterators/basic_row_iterators.h"
+#include "sql/iterators/row_iterator.h"
 #include "sql/iterators/timing_iterator.h"
 #include "sql/join_optimizer/access_path.h"
 #include "sql/join_optimizer/bit_utils.h"
@@ -90,26 +89,25 @@
 #include "sql/opt_explain_format.h"
 #include "sql/opt_trace.h"  // Opt_trace_object
 #include "sql/query_options.h"
+#include "sql/query_term.h"
 #include "sql/record_buffer.h"  // Record_buffer
 #include "sql/sort_param.h"
 #include "sql/sql_array.h"  // Bounds_checked_array
-#include "sql/sql_base.h"   // fill_record
-#include "sql/sql_bitmap.h"
 #include "sql/sql_class.h"
+#include "sql/sql_cmd.h"
 #include "sql/sql_const.h"
 #include "sql/sql_delete.h"
-#include "sql/sql_executor.h"
 #include "sql/sql_list.h"
 #include "sql/sql_optimizer.h"  // JOIN
 #include "sql/sql_resolver.h"
 #include "sql/sql_select.h"
+#include "sql/sql_sort.h"
 #include "sql/sql_tmp_table.h"  // create_tmp_table
 #include "sql/sql_update.h"
 #include "sql/table.h"
 #include "sql/temp_table_param.h"
 #include "sql/visible_fields.h"
 #include "sql/window.h"
-#include "tables_contained_in.h"
 #include "template_utils.h"
 #include "thr_lock.h"
 
@@ -827,8 +825,9 @@ static AccessPath *NewInvalidatorAccessPathForTable(
 
 static table_map ConvertQepTabMapToTableMap(JOIN *join, qep_tab_map tables) {
   table_map map = 0;
-  for (QEP_TAB *tab : TablesContainedIn(join, tables)) {
-    map |= tab->table_ref->map();
+  for (size_t idx : BitsSetIn(tables)) {
+    assert(idx < join->tables);
+    map |= join->qep_tab[idx].table_ref->map();
   }
   return map;
 }

sql/sql_executor.cc

@@ -29,43 +29,34 @@
 */
 
 #include <sys/types.h>
-#include <cstring>
-#include <memory>
 #include <string>
 #include <vector>
 
 #include "my_alloc.h"
 #include "my_inttypes.h"
 #include "my_table_map.h"
-#include "sql/iterators/row_iterator.h"
 #include "sql/sql_lex.h"
 #include "sql/sql_opt_exec_shared.h"  // QEP_shared_owner
 #include "sql/table.h"
 #include "sql/temp_table_param.h"  // Temp_table_param
 
-class CacheInvalidatorIterator;
 class Cached_item;
 class Field;
 class Field_longlong;
 class Filesort;
-class FollowTailIterator;
 class Item;
 class Item_sum;
 class JOIN;
 class JOIN_TAB;
 class KEY;
-class MultiRangeRowIterator;
 class Opt_trace_object;
 class QEP_TAB;
 class RowIterator;
 class THD;
-class Window;
 template <class T>
 class mem_root_deque;
 
-enum class Window_retrieve_cached_row_reason;
 struct AccessPath;
-struct CACHE_FIELD;
 struct POSITION;
 template <class T>
 class List;