Bug #26927386: REDUCE COMPILATION TIME [noclose]

Remove the top remaining #include links (those whose removal slims
away at least 100k total parsed lines over a full build, each) that IWYU has
identified as unused.

Change-Id: I3735954f8825e2d8f9fcb16756ee4e7264d6e90d

Author: Steinar H. Gunderson

plugin/group_replication/include/plugin_handlers/primary_election_utils.h

@@ -23,7 +23,11 @@
 #ifndef PRIMARY_ELECTION_UTILS_INCLUDED
 #define PRIMARY_ELECTION_UTILS_INCLUDED
 
-#include "plugin/group_replication/include/plugin.h"
+#include <string>
+
+#include "plugin/group_replication/include/member_version.h"
+
+class Plugin_gcs_message;
 
 class Election_member_info {
  public:

plugin/group_replication/src/plugin_handlers/primary_election_invocation_handler.cc

@@ -21,6 +21,7 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
 #include "plugin/group_replication/include/plugin_handlers/primary_election_invocation_handler.h"
+#include "plugin/group_replication/include/plugin.h"
 #include "plugin/group_replication/include/plugin_handlers/primary_election_utils.h"
 
 Primary_election_handler::Primary_election_handler()

plugin/group_replication/src/plugin_handlers/primary_election_primary_process.cc

@@ -21,6 +21,7 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
 #include "plugin/group_replication/include/plugin_handlers/primary_election_primary_process.h"
+#include "plugin/group_replication/include/plugin.h"
 #include "plugin/group_replication/include/plugin_handlers/primary_election_utils.h"
 
 static void *launch_handler_thread(void *arg) {

plugin/group_replication/src/plugin_handlers/primary_election_secondary_process.cc

@@ -21,6 +21,7 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
 #include "plugin/group_replication/include/plugin_handlers/primary_election_secondary_process.h"
+#include "plugin/group_replication/include/plugin.h"
 #include "plugin/group_replication/include/plugin_handlers/primary_election_utils.h"
 #include "plugin/group_replication/include/plugin_handlers/read_mode_handler.h"
 

plugin/group_replication/src/plugin_handlers/primary_election_utils.cc

@@ -22,6 +22,8 @@
 
 #include "plugin/group_replication/include/plugin_handlers/primary_election_utils.h"
 
+#include "plugin/group_replication/include/plugin.h"
+
 Election_member_info::Election_member_info(const std::string uuid,
                                            const Member_version &version,
                                            bool is_primary)
@@ -164,4 +166,4 @@ void kill_transactions_and_leave_on_election_error(std::string &err_msg) {
   }
 
   DBUG_VOID_RETURN;
-}
+}

plugin/group_replication/src/plugin_handlers/primary_election_validation_handler.cc

@@ -21,6 +21,8 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
 #include "plugin/group_replication/include/plugin_handlers/primary_election_validation_handler.h"
+
+#include "plugin/group_replication/include/plugin.h"
 #include "plugin/group_replication/include/plugin_messages/group_validation_message.h"
 
 int send_validation_message(Group_validation_message *message) {

plugin/x/src/xpl_server.cc

@@ -57,6 +57,7 @@
 #include "plugin/x/src/udf/registrator.h"
 #include "plugin/x/src/xpl_client.h"
 #include "plugin/x/src/xpl_error.h"
+#include "plugin/x/src/xpl_log.h"
 #include "plugin/x/src/xpl_session.h"
 #include "plugin/x/src/xpl_system_variables.h"
 

plugin/x/src/xpl_system_variables.cc

@@ -27,6 +27,9 @@
 #include <stdlib.h>
 
 #include "my_inttypes.h"
+#include "my_sys.h"
+#include "mysql/psi/psi_base.h"
+#include "mysql/service_mysql_alloc.h"
 
 namespace xpl {
 

plugin/x/src/xpl_system_variables.h

@@ -29,7 +29,6 @@
 #include <vector>
 
 #include "plugin/x/ngs/include/ngs_common/bind.h"
-#include "plugin/x/src/xpl_log.h"
 
 #ifdef max_allowed_packet
 #undef max_allowed_packet

sql/dd/dd_table.h

@@ -34,7 +34,6 @@
 #include "sql/dd/types/column.h"  // dd::enum_column_types
 #include "sql/handler.h"          // legacy_db_type
 #include "sql/sql_alter.h"        // Alter_info::enum_enable_or_disable
-#include "sql/system_variables.h"
 
 class Create_field;
 class FOREIGN_KEY;

sql/dd/impl/system_registry.h

@@ -35,7 +35,6 @@
 #include "sql/dd/string_type.h"  // dd::String_type
 #include "sql/dd/types/object_table.h"
 #include "sql/dd/types/system_view.h"
-#include "sql/handler.h"
 #include "sql/plugin_table.h"
 
 namespace dd {

sql/dd/impl/types/object_table_definition_impl.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
 
    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,17 +24,16 @@
 #define DD__OBJECT_TABLE_DEFINITION_IMPL_INCLUDED
 
 #include <map>
+#include <memory>
 #include <vector>
 
 #include "m_string.h"  // my_stpcpy
 #include "my_dbug.h"
-#include "sql/dd/impl/system_registry.h"           // System_tablespaces
 #include "sql/dd/properties.h"                     // dd::tables::DD_properties
 #include "sql/dd/string_type.h"                    // dd::String_type
 #include "sql/dd/types/object_table_definition.h"  // dd::Object_table_definition
 #include "sql/dd/types/table.h"                    // dd::Table
 #include "sql/mysqld.h"                            // lower_case_table_names
-#include "sql/table.h"                             // MYSQL_TABLESPACE_NAME
 
 namespace dd {
 

sql/dd/impl/types/object_table_impl.cc

@@ -24,6 +24,7 @@
 
 #include "sql/dd/impl/bootstrap_ctx.h"            // DD_bootstrap_ctx
 #include "sql/dd/impl/types/object_table_impl.h"  // Object_table_impl
+#include "sql/table.h"
 
 namespace dd {
 

sql/handler.h

@@ -53,8 +53,7 @@
 #include "my_sys.h"
 #include "my_thread_local.h"  // my_errno
 #include "mysql/components/services/psi_table_bits.h"
-#include "sql/dd/object_id.h"   // dd::Object_id
-#include "sql/dd/properties.h"  // dd::Properties
+#include "sql/dd/object_id.h"  // dd::Object_id
 #include "sql/dd/string_type.h"
 #include "sql/dd/types/object_table.h"  // dd::Object_table
 #include "sql/discrete_interval.h"      // Discrete_interval

sql/protocol.h

@@ -27,7 +27,6 @@
 #include "mysql/mysql_lex_string.h"  // LEX_STRING
 #include "mysql_com.h"               // mysql_enum_shutdown_level
 #include "mysql_time.h"              // MYSQL_TIME
-#include "sql/my_decimal.h"          // my_decimal
 #include "sql_string.h"              // String
 #include "violite.h"                 /* SSL && enum_vio_type */
 #ifdef HAVE_OPENSSL
@@ -45,6 +44,7 @@ class THD;
 
 #include "mysql/com_data.h"
 
+class my_decimal;
 class Send_field;
 class Proto_field;
 class Item_param;
@@ -215,10 +215,10 @@ class Protocol {
                              | end_row(...)
         ... same for each row, until all rows are sent ...
                              | send_ok/eof/error(...)
-   However, a protocol implementation might use different schema. For
-   example, Protocol_callback ignores start/end_row when metadata is being
-   sent.
- */
+    However, a protocol implementation might use different schema. For
+    example, Protocol_callback ignores start/end_row when metadata is being
+    sent.
+   */
 
   virtual void start_row() = 0;
   virtual bool end_row() = 0;

sql/rpl_utility.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2018, Oracle and/or its affiliates. All rights reserved.
 
    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,
@@ -43,8 +43,7 @@ struct MY_BITMAP;
 
 #include "map_helpers.h"
 #include "prealloced_array.h"  // Prealloced_array
-#include "sql/handler.h"
-#include "sql/table.h"  // TABLE_LIST
+#include "sql/table.h"         // TABLE_LIST
 
 class Log_event;
 class Relay_log_info;
@@ -324,7 +323,7 @@ class table_def {
       /*
         This type has not been used since before row-based replication,
         so we can safely assume that it really is MYSQL_TYPE_NEWDATE.
-      */
+       */
       case MYSQL_TYPE_DATE:
         source_type = MYSQL_TYPE_NEWDATE;
         break;

sql/sql_admin.h

@@ -26,15 +26,16 @@
 #include <stddef.h>
 #include <set>
 
-#include "clone_handler.h"
 #include "lex_string.h"
 #include "my_dbug.h"
 #include "my_sqlcommand.h"
 #include "sql/histograms/histogram.h"
 #include "sql/memroot_allocator.h"
 #include "sql/sql_cmd.h"            // Sql_cmd
 #include "sql/sql_cmd_ddl_table.h"  // Sql_cmd_ddl_table
+#include "sql/sql_plugin_ref.h"
 
+class Clone_handler;
 class String;
 class THD;
 

sql/sql_tablespace.cc

@@ -40,6 +40,7 @@
 #include "sql/dd/cache/dictionary_client.h"  // dd::Dictionary_client
 #include "sql/dd/dd.h"                       // dd::create_object
 #include "sql/dd/impl/sdi_utils.h"           // dd::sdi_utils::make_guard
+#include "sql/dd/properties.h"
 #include "sql/dd/string_type.h"
 #include "sql/dd/types/tablespace.h"       // dd::fetch_tablespace_table_refs
 #include "sql/dd/types/tablespace_file.h"  // dd::Tablespace_file

storage/innobase/dict/dict0crea.cc

@@ -34,6 +34,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include "btr0btr.h"
 #include "btr0pcur.h"
 #include "dict0boot.h"
+#include "dict0dd.h"
 #include "dict0dict.h"
 #include "dict0priv.h"
 #include "dict0stats.h"

storage/innobase/dict/dict0mem.cc

@@ -38,6 +38,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "data0type.h"
 #endif /* !UNIV_HOTBACKUP */
+#include "dict0dd.h"
 #include "dict0dict.h"
 #include "dict0mem.h"
 #ifndef UNIV_HOTBACKUP

storage/innobase/fts/fts0sql.cc

@@ -32,6 +32,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 
 #include <sys/types.h>
 
+#include "dict0dd.h"
 #include "dict0dict.h"
 #include "fts0priv.h"
 #include "fts0types.h"

storage/innobase/include/row0mysql.h

@@ -38,16 +38,51 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include "ha_prototypes.h"
 #endif /* !UNIV_HOTBACKUP */
 
+#include <stddef.h>
+#include <sys/types.h>
+
 #include "btr0pcur.h"
 #include "data0data.h"
-#include "dict0dd.h"
+#include "data0type.h"
+#include "db0err.h"
 #include "dict0types.h"
+#include "fts0fts.h"
+#include "gis0type.h"
 #include "lob0undo.h"
+#include "lock0types.h"
+#include "mem0mem.h"
+#include "my_compiler.h"
+#include "my_inttypes.h"
 #include "que0types.h"
+#include "rem0types.h"
 #include "row0types.h"
 #include "sess0sess.h"
 #include "sql_cmd.h"
 #include "trx0types.h"
+#include "univ.i"
+
+class THD;
+class ha_innobase;
+class innodb_session_t;
+namespace dd {
+class Table;
+}
+struct TABLE;
+struct btr_pcur_t;
+struct dfield_t;
+struct dict_field_t;
+struct dict_foreign_t;
+struct dict_index_t;
+struct dict_table_t;
+struct dict_v_col_t;
+struct dtuple_t;
+struct ins_node_t;
+struct mtr_t;
+struct que_fork_t;
+struct que_thr_t;
+struct trx_t;
+struct upd_node_t;
+struct upd_t;
 
 #ifndef UNIV_HOTBACKUP
 extern ibool row_rollback_on_timeout;

storage/innobase/include/trx0trx.h

@@ -39,7 +39,6 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include "ha_prototypes.h"
 
 #include "dict0types.h"
-#include "sql/handler.h"
 #include "trx0types.h"
 #include "ut0new.h"
 

storage/innobase/log/log0ddl.cc

@@ -43,6 +43,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include <sql_thd_internal_api.h>
 
 #include "btr0sea.h"
+#include "dict0dd.h"
 #include "dict0mem.h"
 #include "dict0stats.h"
 #include "ha_innodb.h"

storage/innobase/row/row0merge.cc

@@ -38,6 +38,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include <sql_class.h>
 #include "btr0bulk.h"
 #include "dict0crea.h"
+#include "dict0dd.h"
 #include "fsp0sysspace.h"
 #include "ha_prototypes.h"
 #include "handler0alter.h"
@@ -58,6 +59,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include "ut0stage.h"
 
 #include "my_dbug.h"
+#include "sql/table.h"
 
 /* Ignore posix_fadvise() on those platforms where it does not exist */
 #if defined _WIN32

storage/innobase/row/row0quiesce.cc

@@ -33,6 +33,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include <errno.h>
 #include <my_aes.h>
 
+#include "dict0dd.h"
 #include "fsp0sysspace.h"
 #include "ha_prototypes.h"
 #include "ibuf0ibuf.h"

storage/innobase/srv/srv0start.cc

@@ -58,6 +58,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include "current_thd.h"
 #include "data0data.h"
 #include "data0type.h"
+#include "dict0dd.h"
 #include "dict0dict.h"
 #include "fil0fil.h"
 #include "fsp0fsp.h"
@@ -731,9 +732,11 @@ static dberr_t srv_undo_tablespace_fixup_num(space_id_t space_num) {
     return (DB_READ_ONLY);
   }
 
-  /* Search for a file that is using any of the space IDs assigned to this
- undo number. The directory scan assured that there are no duplicate files
- with the same space_id or with the same undo space number. */
+  /*
+    Search for a file that is using any of the space IDs assigned to this
+    undo number. The directory scan assured that there are no duplicate files
+    with the same space_id or with the same undo space number.
+   */
   space_id_t space_id = SPACE_UNKNOWN;
   std::string scanned_name;
   for (size_t ndx = 0;

storage/myisam/ft_boolean_search.cc

@@ -67,6 +67,7 @@
 #include "my_inttypes.h"
 #include "my_macros.h"
 #include "storage/myisam/ftdefs.h"
+#include "storage/myisam/myisamdef.h"
 #include "template_utils.h"
 
 /* search with boolean queries */

storage/myisam/ft_nlq_search.cc

@@ -32,6 +32,7 @@
 #include "my_inttypes.h"
 #include "my_macros.h"
 #include "storage/myisam/ftdefs.h"
+#include "storage/myisam/myisamdef.h"
 
 /* search with natural language queries */
 

storage/myisam/ft_parser.cc

@@ -29,6 +29,7 @@
 #include "my_dbug.h"
 #include "my_inttypes.h"
 #include "storage/myisam/ftdefs.h"
+#include "storage/myisam/myisamdef.h"
 
 struct FT_DOCSTAT {
   FT_WORD *list;