Skip to content

Commit bae47da

Browse files
blauddenblaudden
committed
Bug#29802492 MOVE NDBCLUSTER PLUGIN SOURCE TO STORAGE/NDB
Move ndbcluster plugin source code to storage/ndb/plugin/. Change-Id: Ie03c6005fecc5056ed4a2eaa9344519fed57df24
1 parent 397295c commit bae47da

File tree

124 files changed

+433
-435
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

124 files changed

+433
-435
lines changed

‎.gitattributes‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,5 @@
4040

4141
# NDB is currently exempt and will be taken in a future merge.
4242
/storage/ndb/** !filter
43-
/sql/*ndb* !filter
4443
/sql/abstract_query_plan.h !filter
4544
/sql/abstract_query_plan.cc !filter

‎Doxyfile.in‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -959,6 +959,7 @@ EXCLUDE = cmd-line-utils \
959959
storage/ndb/memcache \
960960
storage/ndb/ndbapi-examples \
961961
storage/ndb/nodejs \
962+
storage/ndb/plugin \
962963
storage/ndb/src \
963964
storage/ndb/test \
964965
storage/ndb/tools \
@@ -983,8 +984,6 @@ EXCLUDE_SYMLINKS = NO
983984
EXCLUDE_PATTERNS = */include/boost*/* \
984985
*/include/mysql/psi/psi_abi*.h \
985986
*/router/src/*/tests/* \
986-
*/sql/*ndb*.h \
987-
*/sql/*ndb*.cc \
988987
*/unittest/* \
989988
*/build-*/*
990989

‎storage/ndb/CMakeLists.txt‎

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -36,62 +36,62 @@ INCLUDE(ndb_add_executable)
3636
# Add the ndbcluster plugin
3737
#
3838
SET(NDBCLUSTER_SOURCES
39-
../../sql/ha_ndbcluster.cc
40-
../../sql/ha_ndbcluster_cond.cc
41-
../../sql/ha_ndbcluster_push.cc
42-
../../sql/ha_ndbcluster_connection.cc
43-
../../sql/ha_ndbcluster_binlog.cc
44-
../../sql/ha_ndb_index_stat.cc
45-
../../sql/ha_ndb_ddl_fk.cc
46-
../../sql/ha_ndbinfo.cc
47-
../../sql/ndb_local_connection.cc
48-
../../sql/ndb_share.cc
49-
../../sql/ndb_thd.cc
50-
../../sql/ndb_thd_ndb.cc
51-
../../sql/ndb_global_schema_lock.cc
52-
../../sql/ndb_mi.cc
53-
../../sql/ndb_conflict_trans.cc
54-
../../sql/ndb_anyvalue.cc
55-
../../sql/ndb_ndbapi_util.cc
56-
../../sql/ndb_binlog_extra_row_info.cc
57-
../../sql/ndb_event_data.cc
58-
../../sql/ndb_schema_object.cc
59-
../../sql/ndb_schema_dist.cc
60-
../../sql/ndb_component.cc
61-
../../sql/ndb_repl_tab.cc
62-
../../sql/ndb_conflict.cc
63-
../../sql/ndb_tdc.cc
64-
../../sql/ndb_log.cc
65-
../../sql/ndb_binlog_thread.cc
66-
../../sql/ndb_name_util.cc
67-
../../sql/ndb_bitmap.cc
68-
../../sql/ndb_table_map.cc
69-
../../sql/ndb_dd.cc
70-
../../sql/ndb_modifiers.cc
71-
../../sql/ndb_dd_client.cc
72-
../../sql/ndb_dd_schema.cc
73-
../../sql/ndb_dd_table.cc
74-
../../sql/ndb_dd_sdi.cc
75-
../../sql/ndb_plugin_reference.cc
76-
../../sql/ndb_server_hooks.cc
77-
../../sql/ndb_binlog_client.cc
78-
../../sql/ndb_metadata.cc
79-
../../sql/ndb_dd_disk_data.cc
80-
../../sql/ndb_dd_upgrade_table.cc
81-
../../sql/ndb_binlog_hooks.cc
82-
../../sql/ndb_util_table.cc
83-
../../sql/ndb_schema_dist_table.cc
84-
../../sql/ndb_fk_util.cpp
85-
../../sql/ndb_schema_trans_guard.cc
86-
../../sql/ndb_create_helper.cc
87-
../../sql/ndb_apply_status_table.cc
88-
../../sql/ndb_metadata_change_monitor.cc
89-
../../sql/ndb_schema_result_table.cc
90-
../../sql/ndb_metadata_sync.cc
91-
../../sql/ndb_ddl_transaction_ctx.cc
92-
../../sql/ndb_record_layout.cc
93-
../../sql/ndb_sql_metadata_table.cc
94-
../../sql/ndb_stored_grants.cc
39+
plugin/ha_ndbcluster.cc
40+
plugin/ha_ndbcluster_cond.cc
41+
plugin/ha_ndbcluster_push.cc
42+
plugin/ha_ndbcluster_connection.cc
43+
plugin/ha_ndbcluster_binlog.cc
44+
plugin/ha_ndb_index_stat.cc
45+
plugin/ha_ndb_ddl_fk.cc
46+
plugin/ha_ndbinfo.cc
47+
plugin/ndb_local_connection.cc
48+
plugin/ndb_share.cc
49+
plugin/ndb_thd.cc
50+
plugin/ndb_thd_ndb.cc
51+
plugin/ndb_global_schema_lock.cc
52+
plugin/ndb_mi.cc
53+
plugin/ndb_conflict_trans.cc
54+
plugin/ndb_anyvalue.cc
55+
plugin/ndb_ndbapi_util.cc
56+
plugin/ndb_binlog_extra_row_info.cc
57+
plugin/ndb_event_data.cc
58+
plugin/ndb_schema_object.cc
59+
plugin/ndb_schema_dist.cc
60+
plugin/ndb_component.cc
61+
plugin/ndb_repl_tab.cc
62+
plugin/ndb_conflict.cc
63+
plugin/ndb_tdc.cc
64+
plugin/ndb_log.cc
65+
plugin/ndb_binlog_thread.cc
66+
plugin/ndb_name_util.cc
67+
plugin/ndb_bitmap.cc
68+
plugin/ndb_table_map.cc
69+
plugin/ndb_dd.cc
70+
plugin/ndb_modifiers.cc
71+
plugin/ndb_dd_client.cc
72+
plugin/ndb_dd_schema.cc
73+
plugin/ndb_dd_table.cc
74+
plugin/ndb_dd_sdi.cc
75+
plugin/ndb_plugin_reference.cc
76+
plugin/ndb_server_hooks.cc
77+
plugin/ndb_binlog_client.cc
78+
plugin/ndb_metadata.cc
79+
plugin/ndb_dd_disk_data.cc
80+
plugin/ndb_dd_upgrade_table.cc
81+
plugin/ndb_binlog_hooks.cc
82+
plugin/ndb_util_table.cc
83+
plugin/ndb_schema_dist_table.cc
84+
plugin/ndb_fk_util.cpp
85+
plugin/ndb_schema_trans_guard.cc
86+
plugin/ndb_create_helper.cc
87+
plugin/ndb_apply_status_table.cc
88+
plugin/ndb_metadata_change_monitor.cc
89+
plugin/ndb_schema_result_table.cc
90+
plugin/ndb_metadata_sync.cc
91+
plugin/ndb_ddl_transaction_ctx.cc
92+
plugin/ndb_record_layout.cc
93+
plugin/ndb_sql_metadata_table.cc
94+
plugin/ndb_stored_grants.cc
9595
)
9696

9797
# Include directories used when building ha_ndbcluster

‎sql/ha_ndb_ddl_fk.cc‎ renamed to ‎storage/ndb/plugin/ha_ndb_ddl_fk.cc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,16 @@
2626

2727
#include "my_dbug.h"
2828
#include "mysql/service_thd_alloc.h"
29-
#include "sql/ha_ndbcluster.h"
3029
#include "sql/key_spec.h"
3130
#include "sql/mysqld.h" // global_system_variables table_alias_charset ...
32-
#include "sql/ndb_fk_util.h"
33-
#include "sql/ndb_log.h"
34-
#include "sql/ndb_table_guard.h"
35-
#include "sql/ndb_tdc.h"
3631
#include "sql/sql_class.h"
3732
#include "sql/sql_lex.h"
3833
#include "sql/sql_table.h"
34+
#include "storage/ndb/plugin/ha_ndbcluster.h"
35+
#include "storage/ndb/plugin/ndb_fk_util.h"
36+
#include "storage/ndb/plugin/ndb_log.h"
37+
#include "storage/ndb/plugin/ndb_table_guard.h"
38+
#include "storage/ndb/plugin/ndb_tdc.h"
3939
#include "template_utils.h"
4040

4141
#define ERR_RETURN(err) \

‎sql/ha_ndb_index_stat.cc‎ renamed to ‎storage/ndb/plugin/ha_ndb_index_stat.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,17 @@
2222
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2323
*/
2424

25-
#include "sql/ha_ndb_index_stat.h"
25+
#include "storage/ndb/plugin/ha_ndb_index_stat.h"
2626

2727
#include <ctype.h>
2828
#include <mysql/plugin.h>
2929
#include <mysql/psi/mysql_thread.h>
3030

3131
#include "my_dbug.h"
32-
#include "sql/ha_ndbcluster.h"
33-
#include "sql/ha_ndbcluster_connection.h"
3432
#include "sql/mysqld.h" // LOCK_global_system_variables
35-
#include "sql/ndb_require.h"
33+
#include "storage/ndb/plugin/ha_ndbcluster.h"
34+
#include "storage/ndb/plugin/ha_ndbcluster_connection.h"
35+
#include "storage/ndb/plugin/ndb_require.h"
3636

3737
// Implementation still uses its own instance
3838
extern Ndb_index_stat_thread ndb_index_stat_thread;

‎sql/ha_ndb_index_stat.h‎ renamed to ‎storage/ndb/plugin/ha_ndb_index_stat.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
2+
Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
33
44
This program is free software; you can redistribute it and/or modify
55
it under the terms of the GNU General Public License, version 2.0,
@@ -27,7 +27,7 @@
2727

2828
#include <mysql/psi/mysql_thread.h>
2929

30-
#include "sql/ndb_component.h"
30+
#include "storage/ndb/plugin/ndb_component.h"
3131

3232
struct NDB_SHARE;
3333
class Ndb_cluster_connection;

‎sql/ha_ndbcluster.cc‎ renamed to ‎storage/ndb/plugin/ha_ndbcluster.cc‎

Lines changed: 41 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,12 @@
2828
MySQL and NDB Cluster
2929
*/
3030

31-
#include "sql/ha_ndbcluster.h"
31+
#include "storage/ndb/plugin/ha_ndbcluster.h"
3232

3333
#include <memory>
3434
#include <sstream>
3535
#include <string>
3636

37-
3837
#include "m_ctype.h"
3938
#include "my_dbug.h"
4039
#include "mysql/components/my_service.h"
@@ -44,42 +43,8 @@
4443
#include "sql/abstract_query_plan.h"
4544
#include "sql/current_thd.h"
4645
#include "sql/derror.h" // ER_THD
47-
#include "sql/ha_ndb_index_stat.h"
48-
#include "sql/ha_ndbcluster_binlog.h"
49-
#include "sql/ha_ndbcluster_cond.h"
50-
#include "sql/ha_ndbcluster_connection.h"
51-
#include "sql/ha_ndbcluster_push.h"
5246
#include "sql/mysqld.h" // global_system_variables table_alias_charset ...
5347
#include "sql/mysqld_thd_manager.h" // Global_THD_manager
54-
#include "sql/ndb_anyvalue.h"
55-
#include "sql/ndb_apply_status_table.h"
56-
#include "sql/ndb_binlog_client.h"
57-
#include "sql/ndb_binlog_extra_row_info.h"
58-
#include "sql/ndb_bitmap.h"
59-
#include "sql/ndb_component.h"
60-
#include "sql/ndb_conflict.h"
61-
#include "sql/ndb_dist_priv_util.h"
62-
#include "sql/ndb_ddl_definitions.h"
63-
#include "sql/ndb_ddl_transaction_ctx.h"
64-
#include "sql/ndb_create_helper.h"
65-
#include "sql/ndb_event_data.h"
66-
#include "sql/ndb_global_schema_lock.h"
67-
#include "sql/ndb_global_schema_lock_guard.h"
68-
#include "sql/ndb_local_connection.h"
69-
#include "sql/ndb_log.h"
70-
#include "sql/ndb_metadata_change_monitor.h"
71-
#include "sql/ndb_metadata_sync.h"
72-
#include "sql/ndb_mi.h"
73-
#include "sql/ndb_modifiers.h"
74-
#include "sql/ndb_name_util.h"
75-
#include "sql/ndb_require.h"
76-
#include "sql/ndb_schema_dist.h"
77-
#include "sql/ndb_schema_trans_guard.h"
78-
#include "sql/ndb_sleep.h"
79-
#include "sql/ndb_table_guard.h"
80-
#include "sql/ndb_metadata.h"
81-
#include "sql/ndb_tdc.h"
82-
#include "sql/ndb_thd.h"
8348
#include "sql/partition_info.h"
8449
#include "sql/sql_alter.h"
8550
#include "sql/sql_lex.h"
@@ -90,6 +55,40 @@
9055
#include "storage/ndb/include/ndbapi/NdbIndexStat.hpp"
9156
#include "storage/ndb/include/ndbapi/NdbInterpretedCode.hpp"
9257
#include "storage/ndb/include/util/SparseBitmask.hpp"
58+
#include "storage/ndb/plugin/ha_ndb_index_stat.h"
59+
#include "storage/ndb/plugin/ha_ndbcluster_binlog.h"
60+
#include "storage/ndb/plugin/ha_ndbcluster_cond.h"
61+
#include "storage/ndb/plugin/ha_ndbcluster_connection.h"
62+
#include "storage/ndb/plugin/ha_ndbcluster_push.h"
63+
#include "storage/ndb/plugin/ndb_anyvalue.h"
64+
#include "storage/ndb/plugin/ndb_apply_status_table.h"
65+
#include "storage/ndb/plugin/ndb_binlog_client.h"
66+
#include "storage/ndb/plugin/ndb_binlog_extra_row_info.h"
67+
#include "storage/ndb/plugin/ndb_bitmap.h"
68+
#include "storage/ndb/plugin/ndb_component.h"
69+
#include "storage/ndb/plugin/ndb_conflict.h"
70+
#include "storage/ndb/plugin/ndb_create_helper.h"
71+
#include "storage/ndb/plugin/ndb_ddl_definitions.h"
72+
#include "storage/ndb/plugin/ndb_ddl_transaction_ctx.h"
73+
#include "storage/ndb/plugin/ndb_dist_priv_util.h"
74+
#include "storage/ndb/plugin/ndb_event_data.h"
75+
#include "storage/ndb/plugin/ndb_global_schema_lock.h"
76+
#include "storage/ndb/plugin/ndb_global_schema_lock_guard.h"
77+
#include "storage/ndb/plugin/ndb_local_connection.h"
78+
#include "storage/ndb/plugin/ndb_log.h"
79+
#include "storage/ndb/plugin/ndb_metadata.h"
80+
#include "storage/ndb/plugin/ndb_metadata_change_monitor.h"
81+
#include "storage/ndb/plugin/ndb_metadata_sync.h"
82+
#include "storage/ndb/plugin/ndb_mi.h"
83+
#include "storage/ndb/plugin/ndb_modifiers.h"
84+
#include "storage/ndb/plugin/ndb_name_util.h"
85+
#include "storage/ndb/plugin/ndb_require.h"
86+
#include "storage/ndb/plugin/ndb_schema_dist.h"
87+
#include "storage/ndb/plugin/ndb_schema_trans_guard.h"
88+
#include "storage/ndb/plugin/ndb_sleep.h"
89+
#include "storage/ndb/plugin/ndb_table_guard.h"
90+
#include "storage/ndb/plugin/ndb_tdc.h"
91+
#include "storage/ndb/plugin/ndb_thd.h"
9392
#include "storage/ndb/src/common/util/parse_mask.hpp"
9493
#include "storage/ndb/src/ndbapi/NdbQueryBuilder.hpp"
9594
#include "storage/ndb/src/ndbapi/NdbQueryOperation.hpp"
@@ -101,12 +100,12 @@
101100
// tablename_to_filename
102101
#include "sql/sql_class.h"
103102
#include "sql/sql_table.h" // build_table_filename,
104-
#include "sql/ndb_dd.h"
105-
#include "sql/ndb_dd_client.h"
106-
#include "sql/ndb_dd_disk_data.h"
107-
#include "sql/ndb_dd_table.h"
108-
#include "sql/ndb_dummy_ts.h"
109-
#include "sql/ndb_server_hooks.h"
103+
#include "storage/ndb/plugin/ndb_dd.h"
104+
#include "storage/ndb/plugin/ndb_dd_client.h"
105+
#include "storage/ndb/plugin/ndb_dd_disk_data.h"
106+
#include "storage/ndb/plugin/ndb_dd_table.h"
107+
#include "storage/ndb/plugin/ndb_dummy_ts.h"
108+
#include "storage/ndb/plugin/ndb_server_hooks.h"
110109

111110
typedef NdbDictionary::Column NDBCOL;
112111
typedef NdbDictionary::Table NDBTAB;

‎sql/ha_ndbcluster.h‎ renamed to ‎storage/ndb/plugin/ha_ndbcluster.h‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,15 @@
3030
NDB Cluster
3131
*/
3232

33-
#include "sql/sql_base.h"
34-
35-
#include "sql/ha_ndbcluster_cond.h"
36-
#include "sql/ndb_conflict.h"
37-
#include "sql/ndb_table_map.h"
3833
#include "sql/partitioning/partition_handler.h"
34+
#include "sql/sql_base.h"
3935
#include "sql/table.h"
4036
#include "storage/ndb/include/kernel/ndb_limits.h"
4137
#include "storage/ndb/include/ndbapi/NdbApi.hpp"
4238
#include "storage/ndb/include/ndbapi/ndbapi_limits.h"
39+
#include "storage/ndb/plugin/ha_ndbcluster_cond.h"
40+
#include "storage/ndb/plugin/ndb_conflict.h"
41+
#include "storage/ndb/plugin/ndb_table_map.h"
4342

4443
#define NDB_HIDDEN_PRIMARY_KEY_LENGTH 8
4544

@@ -101,16 +100,16 @@ class Ndb_fk_list :public List<NdbDictionary::ForeignKey>
101100
};
102101

103102

104-
#include "sql/ndb_ndbapi_util.h"
105-
#include "sql/ndb_share.h"
103+
#include "storage/ndb/plugin/ndb_ndbapi_util.h"
104+
#include "storage/ndb/plugin/ndb_share.h"
106105

107106
struct Ndb_local_table_statistics {
108107
int no_uncommitted_rows_count;
109108
ulong last_count;
110109
ha_rows records;
111110
};
112111

113-
#include "sql/ndb_thd_ndb.h"
112+
#include "storage/ndb/plugin/ndb_thd_ndb.h"
114113

115114
struct st_ndb_status {
116115
st_ndb_status() { memset(this, 0, sizeof(struct st_ndb_status)); }

0 commit comments

Comments
 (0)