Bug#29802492 MOVE NDBCLUSTER PLUGIN SOURCE TO STORAGE/NDB

Move ndbcluster plugin source code to storage/ndb/plugin/.

Change-Id: Ie03c6005fecc5056ed4a2eaa9344519fed57df24

.gitattributes

@@ -40,6 +40,5 @@
 
 # NDB is currently exempt and will be taken in a future merge.
 /storage/ndb/** !filter
-/sql/*ndb* !filter
 /sql/abstract_query_plan.h !filter
 /sql/abstract_query_plan.cc !filter

Doxyfile.in

@@ -959,6 +959,7 @@ EXCLUDE                = cmd-line-utils \
                          storage/ndb/memcache \
                          storage/ndb/ndbapi-examples \
                          storage/ndb/nodejs \
+                         storage/ndb/plugin \
                          storage/ndb/src \
                          storage/ndb/test \
                          storage/ndb/tools \
@@ -983,8 +984,6 @@ EXCLUDE_SYMLINKS       = NO
 EXCLUDE_PATTERNS       = */include/boost*/* \
                          */include/mysql/psi/psi_abi*.h \
                          */router/src/*/tests/* \
-                         */sql/*ndb*.h \
-                         */sql/*ndb*.cc \
                          */unittest/* \
                          */build-*/*
 

storage/ndb/CMakeLists.txt

@@ -36,62 +36,62 @@ INCLUDE(ndb_add_executable)
 # Add the ndbcluster plugin
 #
 SET(NDBCLUSTER_SOURCES
-  ../../sql/ha_ndbcluster.cc
-  ../../sql/ha_ndbcluster_cond.cc
-  ../../sql/ha_ndbcluster_push.cc
-  ../../sql/ha_ndbcluster_connection.cc
-  ../../sql/ha_ndbcluster_binlog.cc
-  ../../sql/ha_ndb_index_stat.cc
-  ../../sql/ha_ndb_ddl_fk.cc
-  ../../sql/ha_ndbinfo.cc
-  ../../sql/ndb_local_connection.cc
-  ../../sql/ndb_share.cc
-  ../../sql/ndb_thd.cc
-  ../../sql/ndb_thd_ndb.cc
-  ../../sql/ndb_global_schema_lock.cc
-  ../../sql/ndb_mi.cc
-  ../../sql/ndb_conflict_trans.cc
-  ../../sql/ndb_anyvalue.cc
-  ../../sql/ndb_ndbapi_util.cc
-  ../../sql/ndb_binlog_extra_row_info.cc
-  ../../sql/ndb_event_data.cc
-  ../../sql/ndb_schema_object.cc
-  ../../sql/ndb_schema_dist.cc
-  ../../sql/ndb_component.cc
-  ../../sql/ndb_repl_tab.cc
-  ../../sql/ndb_conflict.cc
-  ../../sql/ndb_tdc.cc
-  ../../sql/ndb_log.cc
-  ../../sql/ndb_binlog_thread.cc
-  ../../sql/ndb_name_util.cc
-  ../../sql/ndb_bitmap.cc
-  ../../sql/ndb_table_map.cc
-  ../../sql/ndb_dd.cc
-  ../../sql/ndb_modifiers.cc
-  ../../sql/ndb_dd_client.cc
-  ../../sql/ndb_dd_schema.cc
-  ../../sql/ndb_dd_table.cc
-  ../../sql/ndb_dd_sdi.cc
-  ../../sql/ndb_plugin_reference.cc
-  ../../sql/ndb_server_hooks.cc
-  ../../sql/ndb_binlog_client.cc
-  ../../sql/ndb_metadata.cc
-  ../../sql/ndb_dd_disk_data.cc
-  ../../sql/ndb_dd_upgrade_table.cc
-  ../../sql/ndb_binlog_hooks.cc
-  ../../sql/ndb_util_table.cc
-  ../../sql/ndb_schema_dist_table.cc
-  ../../sql/ndb_fk_util.cpp
-  ../../sql/ndb_schema_trans_guard.cc
-  ../../sql/ndb_create_helper.cc
-  ../../sql/ndb_apply_status_table.cc
-  ../../sql/ndb_metadata_change_monitor.cc
-  ../../sql/ndb_schema_result_table.cc
-  ../../sql/ndb_metadata_sync.cc
-  ../../sql/ndb_ddl_transaction_ctx.cc
-  ../../sql/ndb_record_layout.cc
-  ../../sql/ndb_sql_metadata_table.cc
-  ../../sql/ndb_stored_grants.cc
+  plugin/ha_ndbcluster.cc
+  plugin/ha_ndbcluster_cond.cc
+  plugin/ha_ndbcluster_push.cc
+  plugin/ha_ndbcluster_connection.cc
+  plugin/ha_ndbcluster_binlog.cc
+  plugin/ha_ndb_index_stat.cc
+  plugin/ha_ndb_ddl_fk.cc
+  plugin/ha_ndbinfo.cc
+  plugin/ndb_local_connection.cc
+  plugin/ndb_share.cc
+  plugin/ndb_thd.cc
+  plugin/ndb_thd_ndb.cc
+  plugin/ndb_global_schema_lock.cc
+  plugin/ndb_mi.cc
+  plugin/ndb_conflict_trans.cc
+  plugin/ndb_anyvalue.cc
+  plugin/ndb_ndbapi_util.cc
+  plugin/ndb_binlog_extra_row_info.cc
+  plugin/ndb_event_data.cc
+  plugin/ndb_schema_object.cc
+  plugin/ndb_schema_dist.cc
+  plugin/ndb_component.cc
+  plugin/ndb_repl_tab.cc
+  plugin/ndb_conflict.cc
+  plugin/ndb_tdc.cc
+  plugin/ndb_log.cc
+  plugin/ndb_binlog_thread.cc
+  plugin/ndb_name_util.cc
+  plugin/ndb_bitmap.cc
+  plugin/ndb_table_map.cc
+  plugin/ndb_dd.cc
+  plugin/ndb_modifiers.cc
+  plugin/ndb_dd_client.cc
+  plugin/ndb_dd_schema.cc
+  plugin/ndb_dd_table.cc
+  plugin/ndb_dd_sdi.cc
+  plugin/ndb_plugin_reference.cc
+  plugin/ndb_server_hooks.cc
+  plugin/ndb_binlog_client.cc
+  plugin/ndb_metadata.cc
+  plugin/ndb_dd_disk_data.cc
+  plugin/ndb_dd_upgrade_table.cc
+  plugin/ndb_binlog_hooks.cc
+  plugin/ndb_util_table.cc
+  plugin/ndb_schema_dist_table.cc
+  plugin/ndb_fk_util.cpp
+  plugin/ndb_schema_trans_guard.cc
+  plugin/ndb_create_helper.cc
+  plugin/ndb_apply_status_table.cc
+  plugin/ndb_metadata_change_monitor.cc
+  plugin/ndb_schema_result_table.cc
+  plugin/ndb_metadata_sync.cc
+  plugin/ndb_ddl_transaction_ctx.cc
+  plugin/ndb_record_layout.cc
+  plugin/ndb_sql_metadata_table.cc
+  plugin/ndb_stored_grants.cc
 )
 
 # Include directories used when building ha_ndbcluster

sql/ha_ndb_ddl_fk.cc → storage/ndb/plugin/ha_ndb_ddl_fk.cc

@@ -26,16 +26,16 @@
 
 #include "my_dbug.h"
 #include "mysql/service_thd_alloc.h"
-#include "sql/ha_ndbcluster.h"
 #include "sql/key_spec.h"
 #include "sql/mysqld.h"     // global_system_variables table_alias_charset ...
-#include "sql/ndb_fk_util.h"
-#include "sql/ndb_log.h"
-#include "sql/ndb_table_guard.h"
-#include "sql/ndb_tdc.h"
 #include "sql/sql_class.h"
 #include "sql/sql_lex.h"
 #include "sql/sql_table.h"
+#include "storage/ndb/plugin/ha_ndbcluster.h"
+#include "storage/ndb/plugin/ndb_fk_util.h"
+#include "storage/ndb/plugin/ndb_log.h"
+#include "storage/ndb/plugin/ndb_table_guard.h"
+#include "storage/ndb/plugin/ndb_tdc.h"
 #include "template_utils.h"
 
 #define ERR_RETURN(err)                  \

sql/ha_ndb_index_stat.cc → storage/ndb/plugin/ha_ndb_index_stat.cc

@@ -22,17 +22,17 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 */
 
-#include "sql/ha_ndb_index_stat.h"
+#include "storage/ndb/plugin/ha_ndb_index_stat.h"
 
 #include <ctype.h>
 #include <mysql/plugin.h>
 #include <mysql/psi/mysql_thread.h>
 
 #include "my_dbug.h"
-#include "sql/ha_ndbcluster.h"
-#include "sql/ha_ndbcluster_connection.h"
 #include "sql/mysqld.h"     // LOCK_global_system_variables
-#include "sql/ndb_require.h"
+#include "storage/ndb/plugin/ha_ndbcluster.h"
+#include "storage/ndb/plugin/ha_ndbcluster_connection.h"
+#include "storage/ndb/plugin/ndb_require.h"
 
 // Implementation still uses its own instance
 extern Ndb_index_stat_thread ndb_index_stat_thread;

sql/ha_ndb_index_stat.h → storage/ndb/plugin/ha_ndb_index_stat.h

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2011, 2017, 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,
@@ -27,7 +27,7 @@
 
 #include <mysql/psi/mysql_thread.h>
 
-#include "sql/ndb_component.h"
+#include "storage/ndb/plugin/ndb_component.h"
 
 struct NDB_SHARE;
 class Ndb_cluster_connection;

sql/ha_ndbcluster.cc → storage/ndb/plugin/ha_ndbcluster.cc

@@ -28,13 +28,12 @@
   MySQL and NDB Cluster
 */
 
-#include "sql/ha_ndbcluster.h"
+#include "storage/ndb/plugin/ha_ndbcluster.h"
 
 #include <memory>
 #include <sstream>
 #include <string>
 
-
 #include "m_ctype.h"
 #include "my_dbug.h"
 #include "mysql/components/my_service.h"
@@ -44,42 +43,8 @@
 #include "sql/abstract_query_plan.h"
 #include "sql/current_thd.h"
 #include "sql/derror.h"     // ER_THD
-#include "sql/ha_ndb_index_stat.h"
-#include "sql/ha_ndbcluster_binlog.h"
-#include "sql/ha_ndbcluster_cond.h"
-#include "sql/ha_ndbcluster_connection.h"
-#include "sql/ha_ndbcluster_push.h"
 #include "sql/mysqld.h"     // global_system_variables table_alias_charset ...
 #include "sql/mysqld_thd_manager.h" // Global_THD_manager
-#include "sql/ndb_anyvalue.h"
-#include "sql/ndb_apply_status_table.h"
-#include "sql/ndb_binlog_client.h"
-#include "sql/ndb_binlog_extra_row_info.h"
-#include "sql/ndb_bitmap.h"
-#include "sql/ndb_component.h"
-#include "sql/ndb_conflict.h"
-#include "sql/ndb_dist_priv_util.h"
-#include "sql/ndb_ddl_definitions.h"
-#include "sql/ndb_ddl_transaction_ctx.h"
-#include "sql/ndb_create_helper.h"
-#include "sql/ndb_event_data.h"
-#include "sql/ndb_global_schema_lock.h"
-#include "sql/ndb_global_schema_lock_guard.h"
-#include "sql/ndb_local_connection.h"
-#include "sql/ndb_log.h"
-#include "sql/ndb_metadata_change_monitor.h"
-#include "sql/ndb_metadata_sync.h"
-#include "sql/ndb_mi.h"
-#include "sql/ndb_modifiers.h"
-#include "sql/ndb_name_util.h"
-#include "sql/ndb_require.h"
-#include "sql/ndb_schema_dist.h"
-#include "sql/ndb_schema_trans_guard.h"
-#include "sql/ndb_sleep.h"
-#include "sql/ndb_table_guard.h"
-#include "sql/ndb_metadata.h"
-#include "sql/ndb_tdc.h"
-#include "sql/ndb_thd.h"
 #include "sql/partition_info.h"
 #include "sql/sql_alter.h"
 #include "sql/sql_lex.h"
@@ -90,6 +55,40 @@
 #include "storage/ndb/include/ndbapi/NdbIndexStat.hpp"
 #include "storage/ndb/include/ndbapi/NdbInterpretedCode.hpp"
 #include "storage/ndb/include/util/SparseBitmask.hpp"
+#include "storage/ndb/plugin/ha_ndb_index_stat.h"
+#include "storage/ndb/plugin/ha_ndbcluster_binlog.h"
+#include "storage/ndb/plugin/ha_ndbcluster_cond.h"
+#include "storage/ndb/plugin/ha_ndbcluster_connection.h"
+#include "storage/ndb/plugin/ha_ndbcluster_push.h"
+#include "storage/ndb/plugin/ndb_anyvalue.h"
+#include "storage/ndb/plugin/ndb_apply_status_table.h"
+#include "storage/ndb/plugin/ndb_binlog_client.h"
+#include "storage/ndb/plugin/ndb_binlog_extra_row_info.h"
+#include "storage/ndb/plugin/ndb_bitmap.h"
+#include "storage/ndb/plugin/ndb_component.h"
+#include "storage/ndb/plugin/ndb_conflict.h"
+#include "storage/ndb/plugin/ndb_create_helper.h"
+#include "storage/ndb/plugin/ndb_ddl_definitions.h"
+#include "storage/ndb/plugin/ndb_ddl_transaction_ctx.h"
+#include "storage/ndb/plugin/ndb_dist_priv_util.h"
+#include "storage/ndb/plugin/ndb_event_data.h"
+#include "storage/ndb/plugin/ndb_global_schema_lock.h"
+#include "storage/ndb/plugin/ndb_global_schema_lock_guard.h"
+#include "storage/ndb/plugin/ndb_local_connection.h"
+#include "storage/ndb/plugin/ndb_log.h"
+#include "storage/ndb/plugin/ndb_metadata.h"
+#include "storage/ndb/plugin/ndb_metadata_change_monitor.h"
+#include "storage/ndb/plugin/ndb_metadata_sync.h"
+#include "storage/ndb/plugin/ndb_mi.h"
+#include "storage/ndb/plugin/ndb_modifiers.h"
+#include "storage/ndb/plugin/ndb_name_util.h"
+#include "storage/ndb/plugin/ndb_require.h"
+#include "storage/ndb/plugin/ndb_schema_dist.h"
+#include "storage/ndb/plugin/ndb_schema_trans_guard.h"
+#include "storage/ndb/plugin/ndb_sleep.h"
+#include "storage/ndb/plugin/ndb_table_guard.h"
+#include "storage/ndb/plugin/ndb_tdc.h"
+#include "storage/ndb/plugin/ndb_thd.h"
 #include "storage/ndb/src/common/util/parse_mask.hpp"
 #include "storage/ndb/src/ndbapi/NdbQueryBuilder.hpp"
 #include "storage/ndb/src/ndbapi/NdbQueryOperation.hpp"
@@ -101,12 +100,12 @@
                             // tablename_to_filename
 #include "sql/sql_class.h"
 #include "sql/sql_table.h"  // build_table_filename,
-#include "sql/ndb_dd.h"
-#include "sql/ndb_dd_client.h"
-#include "sql/ndb_dd_disk_data.h"
-#include "sql/ndb_dd_table.h"
-#include "sql/ndb_dummy_ts.h"
-#include "sql/ndb_server_hooks.h"
+#include "storage/ndb/plugin/ndb_dd.h"
+#include "storage/ndb/plugin/ndb_dd_client.h"
+#include "storage/ndb/plugin/ndb_dd_disk_data.h"
+#include "storage/ndb/plugin/ndb_dd_table.h"
+#include "storage/ndb/plugin/ndb_dummy_ts.h"
+#include "storage/ndb/plugin/ndb_server_hooks.h"
 
 typedef NdbDictionary::Column NDBCOL;
 typedef NdbDictionary::Table NDBTAB;

sql/ha_ndbcluster.h → storage/ndb/plugin/ha_ndbcluster.h

@@ -30,16 +30,15 @@
   NDB Cluster
 */
 
-#include "sql/sql_base.h"
-
-#include "sql/ha_ndbcluster_cond.h"
-#include "sql/ndb_conflict.h"
-#include "sql/ndb_table_map.h"
 #include "sql/partitioning/partition_handler.h"
+#include "sql/sql_base.h"
 #include "sql/table.h"
 #include "storage/ndb/include/kernel/ndb_limits.h"
 #include "storage/ndb/include/ndbapi/NdbApi.hpp"
 #include "storage/ndb/include/ndbapi/ndbapi_limits.h"
+#include "storage/ndb/plugin/ha_ndbcluster_cond.h"
+#include "storage/ndb/plugin/ndb_conflict.h"
+#include "storage/ndb/plugin/ndb_table_map.h"
 
 #define NDB_HIDDEN_PRIMARY_KEY_LENGTH 8
 
@@ -101,16 +100,16 @@ class Ndb_fk_list :public List<NdbDictionary::ForeignKey>
 };
 
 
-#include "sql/ndb_ndbapi_util.h"
-#include "sql/ndb_share.h"
+#include "storage/ndb/plugin/ndb_ndbapi_util.h"
+#include "storage/ndb/plugin/ndb_share.h"
 
 struct Ndb_local_table_statistics {
   int no_uncommitted_rows_count;
   ulong last_count;
   ha_rows records;
 };
 
-#include "sql/ndb_thd_ndb.h"
+#include "storage/ndb/plugin/ndb_thd_ndb.h"
 
 struct st_ndb_status {
   st_ndb_status() { memset(this, 0, sizeof(struct st_ndb_status)); }