Bug#33814035: Remove unused code in Query_result

Removed send_error() and row_count(), which have multiple
implementations, but no callers.

Removed begin_dataset(), which has been a no-op since the embedded
library was removed.

Removed Query_result_union::m_rows_in_table, which was written to, but
never read.

Cleaned up #include statements with IWYU in the changed files.

Change-Id: Ie088d43210c712703ca763d41d88403ac24414d1

Author: kahatlen

sql/query_result.cc

@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, 2021, Oracle and/or its affiliates.
+/* Copyright (c) 2015, 2022, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License, version 2.0,
@@ -54,6 +54,7 @@
 #include "sql/sql_error.h"
 #include "sql/sql_exchange.h"
 #include "sql/system_variables.h"
+#include "sql/visible_fields.h"
 #include "sql_string.h"
 #include "template_utils.h"  // pointer_cast
 
@@ -143,17 +144,6 @@ bool sql_exchange::escaped_given(void) {
   Handling writing to file
 ************************************************************************/
 
-void Query_result_to_file::send_error(THD *, uint errcode, const char *err) {
-  my_message(errcode, err, MYF(0));
-  if (file > 0) {
-    (void)end_io_cache(&cache);
-    mysql_file_close(file, MYF(0));
-    /* Delete file on error */
-    mysql_file_delete(key_select_to_file, path, MYF(0));
-    file = -1;
-  }
-}
-
 bool Query_result_to_file::send_eof(THD *thd) {
   bool error = (end_io_cache(&cache) != 0);
   if (mysql_file_close(file, MYF(MY_WME)) || thd->is_error()) error = true;

sql/query_result.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, 2021, Oracle and/or its affiliates.
+/* Copyright (c) 2015, 2022, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License, version 2.0,
@@ -26,12 +26,7 @@
 #include <assert.h>
 #include <sys/types.h>
 
-#include <cstddef>
-
-#include "m_ctype.h"
-#include "mem_root_deque.h"
 #include "my_base.h"
-#include "my_compiler.h"  // MY_ATTRIBUTE
 
 #include "my_inttypes.h"
 #include "my_io.h"
@@ -47,6 +42,8 @@ class Query_expression;
 class THD;
 struct CHARSET_INFO;
 struct TABLE_LIST;
+template <class Element_type>
+class mem_root_deque;
 
 /*
   This is used to get result from a query
@@ -130,9 +127,6 @@ class Query_result {
                                         const mem_root_deque<Item *> &list,
                                         uint flags) = 0;
   virtual bool send_data(THD *thd, const mem_root_deque<Item *> &items) = 0;
-  virtual void send_error(THD *, uint errcode, const char *err) {
-    my_message(errcode, err, MYF(0));
-  }
   virtual bool send_eof(THD *thd) = 0;
   /**
     Check if this query returns a result set and therefore is allowed in
@@ -162,15 +156,6 @@ class Query_result {
   virtual void cleanup(THD *) { /* do nothing */
   }
 
-  void begin_dataset() {}
-
-  /// @returns Pointer to count of rows retained by this result.
-  virtual const ha_rows *row_count() const /* purecov: inspected */
-  {
-    assert(false);
-    return nullptr;
-  } /* purecov: inspected */
-
   /**
     Checks if this Query_result intercepts and transforms the result set.
 
@@ -246,7 +231,6 @@ class Query_result_to_file : public Query_result_interceptor {
 
   bool needs_file_privilege() const override { return true; }
 
-  void send_error(THD *thd, uint errcode, const char *err) override;
   bool send_eof(THD *thd) override;
   void cleanup(THD *thd) override;
 };

sql/sql_cursor.cc

@@ -1,4 +1,4 @@
-/* Copyright (c) 2005, 2021, Oracle and/or its affiliates.
+/* Copyright (c) 2005, 2022, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License, version 2.0,
@@ -400,7 +400,6 @@ bool Materialized_cursor::fetch(ulong num_rows) {
   THD *thd = current_thd;
 
   int res = 0;
-  result->begin_dataset();
   for (fetch_limit += num_rows; fetch_count < fetch_limit; fetch_count++) {
     if ((res = table->file->ha_rnd_next(table->record[0]))) break;
     /* Send data only if the read was successful. */

sql/sql_insert.cc

@@ -31,45 +31,46 @@
 #include <string.h>
 
 #include <atomic>
+#include <iterator>
 #include <map>
 #include <utility>
 
+#include "field_types.h"
 #include "lex_string.h"
 #include "m_ctype.h"
 #include "m_string.h"
 #include "my_alloc.h"
 #include "my_base.h"
 #include "my_bitmap.h"
-#include "my_compiler.h"
 #include "my_dbug.h"
+#include "my_psi_config.h"
 #include "my_sys.h"
 #include "my_table_map.h"
 #include "my_thread_local.h"
 #include "mysql/components/services/bits/psi_bits.h"
-#include "mysql/psi/mysql_table.h"
+#include "mysql/mysql_lex_string.h"
 #include "mysql/service_mysql_alloc.h"
-#include "mysql/udf_registration_types.h"
 #include "mysql_com.h"
 #include "mysqld_error.h"
+#include "pfs_table_provider.h"
 #include "prealloced_array.h"
 #include "sql/auth/auth_acls.h"
 #include "sql/auth/auth_common.h"  // check_grant_all_columns
 #include "sql/binlog.h"
 #include "sql/create_field.h"
 #include "sql/dd/cache/dictionary_client.h"
-#include "sql/dd/dd.h"            // dd::get_dictionary
-#include "sql/dd/dictionary.h"    // dd::Dictionary
-#include "sql/dd/types/column.h"  // dd::Column
-#include "sql/dd/types/table.h"   // dd::Table
-#include "sql/dd_sql_view.h"      // update_referencing_views_metadata
-#include "sql/debug_sync.h"       // DEBUG_SYNC
-#include "sql/derror.h"           // ER_THD
+#include "sql/dd/dd.h"          // dd::get_dictionary
+#include "sql/dd/dictionary.h"  // dd::Dictionary
+#include "sql/dd_sql_view.h"    // update_referencing_views_metadata
+#include "sql/debug_sync.h"     // DEBUG_SYNC
+#include "sql/derror.h"         // ER_THD
 #include "sql/discrete_interval.h"
 #include "sql/field.h"
 #include "sql/handler.h"
 #include "sql/item.h"
 #include "sql/key.h"
 #include "sql/lock.h"  // mysql_unlock_tables
+#include "sql/locked_tables_list.h"
 #include "sql/mdl.h"
 #include "sql/mysqld.h"  // stage_update
 #include "sql/nested_join.h"
@@ -80,26 +81,28 @@
 #include "sql/query_options.h"
 #include "sql/rpl_replica.h"  // rpl_master_has_bug
 #include "sql/rpl_rli.h"      // Relay_log_info
+#include "sql/select_lex_visitor.h"
 #include "sql/sql_alter.h"
 #include "sql/sql_array.h"
 #include "sql/sql_base.h"  // setup_fields
 #include "sql/sql_class.h"
 #include "sql/sql_const.h"
 #include "sql/sql_error.h"
 #include "sql/sql_lex.h"
+#include "sql/sql_list.h"
 #include "sql/sql_resolver.h"  // validate_gc_assignment
 #include "sql/sql_select.h"    // check_privileges_for_list
 #include "sql/sql_show.h"      // store_create_info
 #include "sql/sql_table.h"     // quick_rm_table
-#include "sql/sql_update.h"    // records_are_comparable
 #include "sql/sql_view.h"      // check_key_in_view
+#include "sql/stateless_allocator.h"
 #include "sql/system_variables.h"
 #include "sql/table_trigger_dispatcher.h"  // Table_trigger_dispatcher
 #include "sql/thd_raii.h"
-#include "sql/thr_malloc.h"
 #include "sql/transaction.h"  // trans_commit_stmt
 #include "sql/transaction_info.h"
 #include "sql/trigger_def.h"
+#include "sql/visible_fields.h"
 #include "sql_string.h"
 #include "template_utils.h"
 #include "thr_lock.h"
@@ -2442,12 +2445,6 @@ void Query_result_insert::store_values(THD *thd,
   check_that_all_fields_are_given_values(thd, table, table_list);
 }
 
-void Query_result_insert::send_error(THD *, uint errcode, const char *err) {
-  DBUG_TRACE;
-
-  my_message(errcode, err, MYF(0));
-}
-
 bool Query_result_insert::stmt_binlog_is_trans() const {
   return table->file->has_transactions();
 }
@@ -3070,30 +3067,6 @@ void Query_result_create::store_values(THD *thd,
                                        TRG_EVENT_INSERT, table->s->fields);
 }
 
-void Query_result_create::send_error(THD *thd, uint errcode, const char *err) {
-  DBUG_TRACE;
-
-  DBUG_PRINT("info",
-             ("Current statement %s row-based",
-              thd->is_current_stmt_binlog_format_row() ? "is" : "is NOT"));
-  DBUG_PRINT("info",
-             ("Current table (at %p) %s a temporary (or non-existant) table",
-              table, table && !table->s->tmp_table ? "is NOT" : "is"));
-  /*
-    This will execute any rollbacks that are necessary before writing
-    the transcation cache.
-
-    We disable the binary log since nothing should be written to the
-    binary log.  This disabling is important, since we potentially do
-    a "roll back" of non-transactional tables by removing the table,
-    and the actual rollback might generate events that should not be
-    written to the binary log.
-
-  */
-  Disable_binlog_guard binlog_guard(thd);
-  Query_result_insert::send_error(thd, errcode, err);
-}
-
 bool Query_result_create::stmt_binlog_is_trans() const {
   /*
     Binary logging code assumes that CREATE TABLE statements are

sql/sql_insert.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2006, 2021, Oracle and/or its affiliates.
+/* Copyright (c) 2006, 2022, Oracle and/or its affiliates.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License, version 2.0,
@@ -24,25 +24,27 @@
 #define SQL_INSERT_INCLUDED
 
 #include <assert.h>
-#include <stddef.h>
 #include <sys/types.h>
 
+#include "mem_root_deque.h"
 #include "my_inttypes.h"
 #include "my_sqlcommand.h"
-#include "sql/current_thd.h"
 #include "sql/query_result.h"     // Query_result_interceptor
 #include "sql/sql_cmd_dml.h"      // Sql_cmd_dml
 #include "sql/sql_data_change.h"  // enum_duplicates
-#include "sql/sql_list.h"
 #include "sql/table.h"
+#include "sql/thr_malloc.h"
 
 class Alter_info;
 class Field;
 class Item;
 class Query_expression;
+class Select_lex_visitor;
 class THD;
 struct HA_CREATE_INFO;
 struct handlerton;
+struct MYSQL_LEX_CSTRING;
+struct MY_BITMAP;
 
 using List_item = mem_root_deque<Item *>;
 struct MYSQL_LOCK;
@@ -148,7 +150,6 @@ are found inside the COPY_INFO.
   bool start_execution(THD *thd) override;
   bool send_data(THD *thd, const mem_root_deque<Item *> &items) override;
   virtual void store_values(THD *thd, const mem_root_deque<Item *> &values);
-  void send_error(THD *thd, uint errcode, const char *err) override;
   bool send_eof(THD *thd) override;
   void abort_result_set(THD *thd) override;
   void cleanup(THD *thd) override;
@@ -197,7 +198,6 @@ class Query_result_create final : public Query_result_insert {
   bool prepare(THD *thd, const mem_root_deque<Item *> &list,
                Query_expression *u) override;
   void store_values(THD *thd, const mem_root_deque<Item *> &values) override;
-  void send_error(THD *thd, uint errcode, const char *err) override;
   bool send_eof(THD *thd) override;
   void abort_result_set(THD *thd) override;
   bool create_table_for_query_block(THD *thd) override;

sql/sql_union.cc

@@ -38,13 +38,14 @@
 
 #include <algorithm>
 #include <atomic>
+#include <cassert>
 #include <cstdio>
-#include <cstdlib>  // abort
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
+#include "mem_root_deque.h"
 #include "my_alloc.h"
 #include "my_base.h"
 #include "my_dbug.h"
@@ -61,21 +62,19 @@
 #include "sql/handler.h"
 #include "sql/item.h"
 #include "sql/item_subselect.h"
-#include "sql/item_sum.h"
-#include "sql/iterators/basic_row_iterators.h"
-#include "sql/iterators/composite_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/explain_access_path.h"
 #include "sql/join_optimizer/join_optimizer.h"
+#include "sql/join_optimizer/materialize_path_parameters.h"
 #include "sql/mem_root_array.h"
 #include "sql/mysqld.h"
 #include "sql/opt_explain.h"  // explain_no_table
 #include "sql/opt_explain_format.h"
 #include "sql/opt_trace.h"
 #include "sql/parse_tree_node_base.h"
 #include "sql/parse_tree_nodes.h"  // PT_with_clause
+#include "sql/parser_yystype.h"
 #include "sql/pfs_batch_mode.h"
 #include "sql/protocol.h"
 #include "sql/query_options.h"
@@ -92,6 +91,7 @@
 #include "sql/sql_tmp_table.h"   // tmp tables
 #include "sql/table_function.h"  // Table_function
 #include "sql/thd_raii.h"
+#include "sql/visible_fields.h"
 #include "sql/window.h"  // Window
 #include "template_utils.h"
 
@@ -118,7 +118,6 @@ bool Query_result_union::send_data(THD *thd,
 
   const int error = table->file->ha_write_row(table->record[0]);
   if (!error) {
-    m_rows_in_table++;
     return false;
   }
   // create_ondisk_from_heap will generate error if needed
@@ -129,7 +128,6 @@ bool Query_result_union::send_data(THD *thd,
       return true; /* purecov: inspected */
     // Table's engine changed, index is not initialized anymore
     if (table->hash_field) table->file->ha_index_init(0, false);
-    if (!is_duplicate) m_rows_in_table++;
   }
   return false;
 }
@@ -216,7 +214,6 @@ bool Query_result_union::create_result_table(
 */
 
 bool Query_result_union::reset() {
-  m_rows_in_table = 0;
   return table ? table->empty_result_table() : false;
 }
 
@@ -271,9 +268,6 @@ class Query_result_union_direct final : public Query_result_union {
     execution_started = true;
     return result->start_execution(thd);
   }
-  void send_error(THD *thd, uint errcode, const char *err) override {
-    result->send_error(thd, errcode, err); /* purecov: inspected */
-  }
   bool send_eof(THD *) override {
     // Should never be called.
     my_abort();