Bug#29899022: REDUCE DEPENDENCIES ON PROTOCOL.H

Make the THD class have pointers to the Protocol_text and
Protocol_binary instances, so that sql_class.h doesn't have to include
protocol.h and protocol_classic.h.

Move the Query_fetch_protocol_binary class definition from
sql_prepare.h to sql_prepare.cc, since it is only used in that file.

Move PTI_simple_ident_q_3d::itemize() from parse_tree_items.h to
parse_tree_items.h, so that the header doesn't need to include
protocol.h.

Include plugin.h instead of protocol.h from thd_var_access.h, as it is
only used to get the definition of MYSQL_THD.

Change-Id: Iecc1b4986b45533d9b2187e7a25d6c4dd932f6f0

Author: kahatlen

plugin/group_replication/src/applier.cc

@@ -39,6 +39,7 @@
 #include "plugin/group_replication/include/plugin_server_include.h"
 #include "plugin/group_replication/include/services/notification/notification.h"
 #include "plugin/group_replication/libmysqlgcs/include/mysql/gcs/gcs_member_identifier.h"
+#include "sql/protocol_classic.h"
 
 char applier_module_channel_name[] = "group_replication_applier";
 bool applier_thread_is_exiting = false;

plugin/innodb_memcached/innodb_memcache/src/handler_api.cc

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2011, 2019, 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, as published by the
@@ -51,6 +51,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include "sql/log_event.h"
 #include "sql/mysqld.h"
 #include "sql/mysqld_thd_manager.h"
+#include "sql/protocol_classic.h"
 #include "sql/sql_base.h"
 #include "sql/sql_class.h"
 #include "sql/sql_handler.h"

plugin/semisync/semisync_master_ack_receiver.cc

@@ -1,4 +1,4 @@
-/* Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2019, 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,
@@ -34,6 +34,8 @@
 #include "plugin/semisync/semisync.h"
 #include "plugin/semisync/semisync_master.h"
 #include "plugin/semisync/semisync_master_socket_listener.h"
+#include "sql/protocol_classic.h"
+#include "sql/sql_class.h"
 
 extern ReplSemiSyncMaster *repl_semisync;
 

plugin/semisync/semisync_master_plugin.cc

@@ -32,6 +32,7 @@
 #include "plugin/semisync/semisync_master.h"
 #include "plugin/semisync/semisync_master_ack_receiver.h"
 #include "sql/current_thd.h"
+#include "sql/protocol_classic.h"
 #include "sql/sql_class.h"  // THD
 #include "typelib.h"
 

sql/ha_ndbcluster_binlog.cc

@@ -61,6 +61,7 @@
 #include "sql/ndb_table_guard.h"
 #include "sql/ndb_tdc.h"
 #include "sql/ndb_thd.h"
+#include "sql/protocol_classic.h"
 #include "sql/rpl_injector.h"
 #include "sql/rpl_slave.h"
 #include "sql/sql_lex.h"

sql/item_func.cc

@@ -95,6 +95,7 @@
 #include "sql/mdl.h"
 #include "sql/mysqld.h"              // log_10 stage_user_sleep
 #include "sql/parse_tree_helpers.h"  // PT_item_list
+#include "sql/protocol.h"
 #include "sql/psi_memory_key.h"
 #include "sql/resourcegroups/resource_group.h"
 #include "sql/resourcegroups/resource_group_basic_types.h"
@@ -125,9 +126,6 @@
 #include "template_utils.h"       // pointer_cast
 #include "thr_mutex.h"
 
-class Protocol;
-class sp_rcontext;
-
 using std::max;
 using std::min;
 

sql/log.cc

@@ -82,6 +82,7 @@
 #include "sql/field.h"
 #include "sql/handler.h"
 #include "sql/mysqld.h"
+#include "sql/protocol_classic.h"
 #include "sql/psi_memory_key.h"  // key_memory_File_query_log_name
 #include "sql/query_options.h"
 #include "sql/sql_audit.h"  // mysql_audit_general_log

sql/parse_tree_items.cc

@@ -25,10 +25,12 @@
 #include "my_dbug.h"
 #include "my_sqlcommand.h"
 #include "mysql/udf_registration_types.h"
+#include "mysql_com.h"
 #include "sql/auth/auth_acls.h"
 #include "sql/item_cmpfunc.h"  // Item_func_eq
 #include "sql/mysqld.h"        // using_udf_functions
 #include "sql/parse_tree_nodes.h"
+#include "sql/protocol.h"
 #include "sql/sp.h"
 #include "sql/sp_pcontext.h"  // sp_pcontext
 #include "sql/sql_udf.h"
@@ -377,6 +379,25 @@ bool PTI_simple_ident_ident::itemize(Parse_context *pc, Item **res) {
   return *res == NULL;
 }
 
+bool PTI_simple_ident_q_3d::itemize(Parse_context *pc, Item **res) {
+  if (super::itemize(pc, res)) return true;
+
+  THD *thd = pc->thd;
+  const char *schema =
+      thd->get_protocol()->has_client_capability(CLIENT_NO_SCHEMA) ? nullptr
+                                                                   : db;
+  if (pc->select->no_table_names_allowed) {
+    my_error(ER_TABLENAME_NOT_ALLOWED_HERE, MYF(0), table, thd->where);
+  }
+  if ((pc->select->parsing_place != CTX_HAVING) ||
+      (pc->select->get_in_sum_expr() > 0)) {
+    *res = new (pc->mem_root) Item_field(POS(), schema, table, field);
+  } else {
+    *res = new (pc->mem_root) Item_ref(POS(), schema, table, field);
+  }
+  return *res == nullptr || (*res)->itemize(pc, res);
+}
+
 bool PTI_simple_ident_q_2d::itemize(Parse_context *pc, Item **res) {
   THD *thd = pc->thd;
   LEX *lex = thd->lex;

sql/parse_tree_items.h

@@ -34,20 +34,18 @@
 #include "my_inttypes.h"
 #include "my_sys.h"
 #include "my_time.h"
-#include "mysql_com.h"
 #include "mysqld_error.h"
 #include "sql/field.h"
 #include "sql/item.h"
+#include "sql/item_cmpfunc.h"
 #include "sql/item_create.h"  // Create_func
 #include "sql/item_func.h"
-#include "sql/item_strfunc.h"
 #include "sql/item_subselect.h"
 #include "sql/item_sum.h"       // Item_sum_count
 #include "sql/item_timefunc.h"  // Item_func_now_local
 #include "sql/parse_location.h"
 #include "sql/parse_tree_helpers.h"  // Parse_tree_item
 #include "sql/parse_tree_node_base.h"
-#include "sql/protocol.h"
 #include "sql/set_var.h"
 #include "sql/sp_head.h"  // sp_head
 #include "sql/sql_class.h"
@@ -157,24 +155,7 @@ class PTI_simple_ident_q_3d : public Parse_tree_item {
                         const char *table_arg, const char *field_arg)
       : super(pos), db(db_arg), table(table_arg), field(field_arg) {}
 
-  bool itemize(Parse_context *pc, Item **res) override {
-    if (super::itemize(pc, res)) return true;
-
-    THD *thd = pc->thd;
-    const char *schema =
-        thd->get_protocol()->has_client_capability(CLIENT_NO_SCHEMA) ? NULL
-                                                                     : db;
-    if (pc->select->no_table_names_allowed) {
-      my_error(ER_TABLENAME_NOT_ALLOWED_HERE, MYF(0), table, thd->where);
-    }
-    if ((pc->select->parsing_place != CTX_HAVING) ||
-        (pc->select->get_in_sum_expr() > 0)) {
-      *res = new (pc->mem_root) Item_field(POS(), schema, table, field);
-    } else {
-      *res = new (pc->mem_root) Item_ref(POS(), schema, table, field);
-    }
-    return *res == NULL || (*res)->itemize(pc, res);
-  }
+  bool itemize(Parse_context *pc, Item **res) override;
 };
 
 /**

sql/protocol.h

@@ -24,25 +24,12 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
 #include "my_dbug.h"
+#include "mysql/com_data.h"
 #include "mysql/mysql_lex_string.h"  // LEX_STRING
 #include "mysql_com.h"               // mysql_enum_shutdown_level
 #include "mysql_time.h"              // MYSQL_TIME
 #include "sql_string.h"              // String
 #include "violite.h"                 /* SSL && enum_vio_type */
-#ifdef HAVE_OPENSSL
-#define SSL_handle SSL *
-#else
-#define SSL_handle void *
-#endif
-
-#ifdef __cplusplus
-class THD;
-#define MYSQL_THD THD *
-#else
-#define MYSQL_THD void *
-#endif
-
-#include "mysql/com_data.h"
 
 class my_decimal;
 class Send_field;

sql/rpl_channel_service_interface.cc

@@ -51,6 +51,7 @@
 #include "sql/log_event.h"
 #include "sql/mysqld.h"              // opt_mts_slave_parallel_workers
 #include "sql/mysqld_thd_manager.h"  // Global_THD_manager
+#include "sql/protocol_classic.h"
 #include "sql/rpl_gtid.h"
 #include "sql/rpl_info_factory.h"
 #include "sql/rpl_info_handler.h"

sql/server_component/clone_protocol_service.cc

@@ -29,6 +29,7 @@
 #include "my_byteorder.h"
 #include "mysql.h"
 #include "sql/mysqld.h"
+#include "sql/protocol_classic.h"
 #include "sql/set_var.h"
 #include "sql/sql_class.h"
 #include "sql/sql_show.h"

sql/set_var.cc

@@ -1323,8 +1323,8 @@ int set_var_collation_client::update(THD *thd) {
           ->is_enabled())
     thd->session_tracker.get_tracker(SESSION_STATE_CHANGE_TRACKER)
         ->mark_as_changed(thd, NULL);
-  thd->protocol_text.init(thd);
-  thd->protocol_binary.init(thd);
+  thd->protocol_text->init(thd);
+  thd->protocol_binary->init(thd);
   return 0;
 }
 

sql/sql_admin.cc

@@ -70,6 +70,7 @@
 #include "sql/mysqld.h"             // key_file_misc
 #include "sql/partition_element.h"  // PART_ADMIN
 #include "sql/protocol.h"
+#include "sql/protocol_classic.h"
 #include "sql/rpl_group_replication.h"  // is_group_replication_running
 #include "sql/rpl_gtid.h"
 #include "sql/sp.h"           // Sroutine_hash_entry

sql/sql_class.cc

@@ -63,6 +63,8 @@
 #include "sql/mysqld.h"              // global_system_variables ...
 #include "sql/mysqld_thd_manager.h"  // Global_THD_manager
 #include "sql/parse_location.h"
+#include "sql/protocol.h"
+#include "sql/protocol_classic.h"
 #include "sql/psi_memory_key.h"
 #include "sql/query_result.h"
 #include "sql/rpl_rli.h"    // Relay_log_info
@@ -364,6 +366,8 @@ THD::THD(bool enable_plugins)
       m_current_query_partial_plans(0),
       m_main_security_ctx(this),
       m_security_ctx(&m_main_security_ctx),
+      protocol_text(new Protocol_text),
+      protocol_binary(new Protocol_binary),
       query_plan(this),
       m_current_stage_key(0),
       current_mutex(NULL),
@@ -519,10 +523,10 @@ THD::THD(bool enable_plugins)
   sp_func_cache = NULL;
 
   /* Protocol */
-  m_protocol = &protocol_text;  // Default protocol
-  protocol_text.init(this);
-  protocol_binary.init(this);
-  protocol_text.set_client_capabilities(0);  // minimalistic client
+  m_protocol = protocol_text.get();  // Default protocol
+  protocol_text->init(this);
+  protocol_binary->init(this);
+  protocol_text->set_client_capabilities(0);  // minimalistic client
 
   /*
     Make sure thr_lock_info_init() is called for threads which do not get
@@ -2759,3 +2763,36 @@ void THD::cleanup_after_parse_error() {
     }
   }
 }
+
+bool THD::is_classic_protocol() const {
+  return get_protocol()->type() == Protocol::PROTOCOL_BINARY ||
+         get_protocol()->type() == Protocol::PROTOCOL_TEXT;
+}
+
+bool THD::is_connected() {
+  /*
+    All system threads (e.g., the slave IO thread) are connected but
+    not using vio. So this function always returns true for all
+    system threads.
+  */
+  if (system_thread) return true;
+
+  if (is_classic_protocol())
+    return get_protocol()->connection_alive() &&
+           vio_is_connected(get_protocol_classic()->get_vio());
+
+  return get_protocol()->connection_alive();
+}
+
+void THD::push_protocol(Protocol *protocol) {
+  DBUG_ASSERT(m_protocol != nullptr);
+  DBUG_ASSERT(protocol != nullptr);
+  m_protocol->push_protocol(protocol);
+  m_protocol = protocol;
+}
+
+void THD::pop_protocol() {
+  DBUG_ASSERT(m_protocol != nullptr);
+  m_protocol = m_protocol->pop_protocol();
+  DBUG_ASSERT(m_protocol != nullptr);
+}