From 284f9226fb1e6b5a3a7436616c0e11b2a45f04d6 Mon Sep 17 00:00:00 2001 From: Nayuta Yanagisawa Date: Fri, 28 Jan 2022 16:13:12 +0900 Subject: [PATCH] MDEV-27656 Spider: remove #ifdef SPIDER_HAS_DISCOVER_TABLE_STRUCTURE --- storage/spider/spd_db_include.h | 4 ---- storage/spider/spd_db_mysql.cc | 6 ------ storage/spider/spd_db_mysql.h | 4 ---- storage/spider/spd_db_oracle.cc | 4 ---- storage/spider/spd_db_oracle.h | 4 ---- storage/spider/spd_table.cc | 4 ---- storage/spider/spd_table.h | 2 -- 7 files changed, 28 deletions(-) diff --git a/storage/spider/spd_db_include.h b/storage/spider/spd_db_include.h index 088acc7e794..401658e22d1 100644 --- a/storage/spider/spd_db_include.h +++ b/storage/spider/spd_db_include.h @@ -924,7 +924,6 @@ public: longlong pos ) = 0; virtual int get_errno() = 0; -#ifdef SPIDER_HAS_DISCOVER_TABLE_STRUCTURE virtual int fetch_columns_for_discover_table_structure( spider_string *str, CHARSET_INFO *access_charset @@ -938,7 +937,6 @@ public: SPIDER_SHARE *spider_share, CHARSET_INFO *access_charset ) = 0; -#endif virtual uint limit_mode(); }; @@ -1145,13 +1143,11 @@ public: uint alias_length ) = 0; virtual bool need_change_db_table_name() = 0; -#ifdef SPIDER_HAS_DISCOVER_TABLE_STRUCTURE virtual int discover_table_structure( SPIDER_TRX *trx, SPIDER_SHARE *spider_share, spider_string *str ) = 0; -#endif virtual bool checksum_support(); }; diff --git a/storage/spider/spd_db_mysql.cc b/storage/spider/spd_db_mysql.cc index 9fc72ee6458..9b7ee41c8ef 100644 --- a/storage/spider/spd_db_mysql.cc +++ b/storage/spider/spd_db_mysql.cc @@ -138,7 +138,6 @@ static const char *name_quote_str = SPIDER_SQL_NAME_QUOTE_STR; #define SPIDER_SQL_BINLOG_GTID_POS_STR "select binlog_gtid_pos" #define SPIDER_SQL_BINLOG_GTID_POS_LEN sizeof(SPIDER_SQL_BINLOG_GTID_POS_STR) - 1 -#ifdef SPIDER_HAS_DISCOVER_TABLE_STRUCTURE #define SPIDER_SQL_SHOW_COLUMNS_STR "show columns from " #define SPIDER_SQL_SHOW_COLUMNS_LEN sizeof(SPIDER_SQL_SHOW_COLUMNS_STR) - 1 #define SPIDER_SQL_SELECT_COLUMNS_STR "select `column_name`,`column_default`,`is_nullable`,`character_set_name`,`collation_name`,`column_type`,`extra` from `information_schema`.`columns` where `table_schema` = " @@ -154,7 +153,6 @@ static const char *name_quote_str = SPIDER_SQL_NAME_QUOTE_STR; #define SPIDER_SQL_SPATIAL_LEN sizeof(SPIDER_SQL_SPATIAL_STR) - 1 #define SPIDER_SQL_USING_HASH_STR " using hash" #define SPIDER_SQL_USING_HASH_LEN sizeof(SPIDER_SQL_USING_HASH_STR) - 1 -#endif #define SPIDER_SQL_SHOW_RECORDS_RECORDS_POS 0 #define SPIDER_SQL_EXPLAIN_SELECT_RECORDS_POS 8 @@ -1383,7 +1381,6 @@ int spider_db_mbase_result::get_errno() DBUG_RETURN(store_error_num); } -#ifdef SPIDER_HAS_DISCOVER_TABLE_STRUCTURE int spider_db_mbase_result::fetch_columns_for_discover_table_structure( spider_string *str, CHARSET_INFO *access_charset @@ -1756,7 +1753,6 @@ int spider_db_mbase_result::fetch_table_for_discover_table_structure( } DBUG_RETURN(0); } -#endif spider_db_mbase::spider_db_mbase( SPIDER_CONN *conn, @@ -8374,7 +8370,6 @@ bool spider_mbase_share::need_change_db_table_name() DBUG_RETURN(!same_db_table_name); } -#ifdef SPIDER_HAS_DISCOVER_TABLE_STRUCTURE int spider_mbase_share::discover_table_structure( SPIDER_TRX *trx, SPIDER_SHARE *spider_share, @@ -8678,7 +8673,6 @@ int spider_mbase_share::discover_table_structure( } DBUG_RETURN(error_num); } -#endif bool spider_mbase_share::checksum_support() { diff --git a/storage/spider/spd_db_mysql.h b/storage/spider/spd_db_mysql.h index ba6feaa2dfd..534216ca485 100644 --- a/storage/spider/spd_db_mysql.h +++ b/storage/spider/spd_db_mysql.h @@ -352,7 +352,6 @@ public: longlong pos ); int get_errno(); -#ifdef SPIDER_HAS_DISCOVER_TABLE_STRUCTURE int fetch_columns_for_discover_table_structure( spider_string *str, CHARSET_INFO *access_charset @@ -366,7 +365,6 @@ public: SPIDER_SHARE *spider_share, CHARSET_INFO *access_charset ); -#endif }; class spider_db_mysql_result: public spider_db_mbase_result @@ -672,13 +670,11 @@ public: int *table_name_pos ); bool need_change_db_table_name(); -#ifdef SPIDER_HAS_DISCOVER_TABLE_STRUCTURE int discover_table_structure( SPIDER_TRX *trx, SPIDER_SHARE *spider_share, spider_string *str ); -#endif bool checksum_support(); protected: int create_table_names_str(); diff --git a/storage/spider/spd_db_oracle.cc b/storage/spider/spd_db_oracle.cc index e7ac784d592..601a2320825 100644 --- a/storage/spider/spd_db_oracle.cc +++ b/storage/spider/spd_db_oracle.cc @@ -1079,7 +1079,6 @@ int spider_db_oracle_result::get_errno() DBUG_RETURN(store_error_num); } -#ifdef SPIDER_HAS_DISCOVER_TABLE_STRUCTURE int spider_db_oracle_result::fetch_columns_for_discover_table_structure( spider_string *str, CHARSET_INFO *access_charset @@ -1107,7 +1106,6 @@ int spider_db_oracle_result::fetch_table_for_discover_table_structure( DBUG_PRINT("info",("spider this=%p", this)); DBUG_RETURN(HA_ERR_WRONG_COMMAND); } -#endif spider_db_oracle::spider_db_oracle( SPIDER_CONN *conn @@ -5404,7 +5402,6 @@ bool spider_oracle_share::need_change_db_table_name() DBUG_RETURN(!same_db_table_name); } -#ifdef SPIDER_HAS_DISCOVER_TABLE_STRUCTURE int spider_oracle_share::discover_table_structure( SPIDER_TRX *trx, SPIDER_SHARE *spider_share, @@ -5414,7 +5411,6 @@ int spider_oracle_share::discover_table_structure( DBUG_PRINT("info",("spider this=%p", this)); DBUG_RETURN(HA_ERR_WRONG_COMMAND); } -#endif spider_oracle_handler::spider_oracle_handler( ha_spider *spider, diff --git a/storage/spider/spd_db_oracle.h b/storage/spider/spd_db_oracle.h index 5f7f4e8ff1f..0e8a89b5f10 100644 --- a/storage/spider/spd_db_oracle.h +++ b/storage/spider/spd_db_oracle.h @@ -272,7 +272,6 @@ public: longlong pos ); int get_errno(); -#ifdef SPIDER_HAS_DISCOVER_TABLE_STRUCTURE int fetch_columns_for_discover_table_structure( spider_string *str, CHARSET_INFO *access_charset @@ -286,7 +285,6 @@ public: SPIDER_SHARE *spider_share, CHARSET_INFO *access_charset ); -#endif /* for oracle */ int set_column_info(); }; @@ -558,13 +556,11 @@ public: int *table_name_pos ); bool need_change_db_table_name(); -#ifdef SPIDER_HAS_DISCOVER_TABLE_STRUCTURE int discover_table_structure( SPIDER_TRX *trx, SPIDER_SHARE *spider_share, spider_string *str ); -#endif private: int create_table_names_str(); void free_table_names_str(); diff --git a/storage/spider/spd_table.cc b/storage/spider/spd_table.cc index aa48152f032..8c8eeb7cb59 100644 --- a/storage/spider/spd_table.cc +++ b/storage/spider/spd_table.cc @@ -6633,9 +6633,7 @@ int spider_db_init( spider_hton->flush_logs = spider_flush_logs; spider_hton->commit = spider_commit; spider_hton->rollback = spider_rollback; -#ifdef SPIDER_HAS_DISCOVER_TABLE_STRUCTURE spider_hton->discover_table_structure = spider_discover_table_structure; -#endif if (spider_param_support_xa()) { spider_hton->prepare = spider_xa_prepare; @@ -8582,7 +8580,6 @@ double spider_rand( DBUG_RETURN(my_rnd(&rand)); } -#ifdef SPIDER_HAS_DISCOVER_TABLE_STRUCTURE int spider_discover_table_structure_internal( SPIDER_TRX *trx, SPIDER_SHARE *spider_share, @@ -8948,7 +8945,6 @@ int spider_discover_table_structure( str.length()); DBUG_RETURN(error_num); } -#endif int spider_create_spider_object_for_share( SPIDER_TRX *trx, diff --git a/storage/spider/spd_table.h b/storage/spider/spd_table.h index 8188da3d2b3..598d1e79e5b 100644 --- a/storage/spider/spd_table.h +++ b/storage/spider/spd_table.h @@ -730,7 +730,6 @@ double spider_rand( uint32 rand_source ); -#ifdef SPIDER_HAS_DISCOVER_TABLE_STRUCTURE int spider_discover_table_structure_internal( SPIDER_TRX *trx, SPIDER_SHARE *spider_share, @@ -743,7 +742,6 @@ int spider_discover_table_structure( TABLE_SHARE *share, HA_CREATE_INFO *info ); -#endif int spider_create_spider_object_for_share( SPIDER_TRX *trx,