From 7b006b6e74cb8fbafc029fcb8de7e27c01767ec5 Mon Sep 17 00:00:00 2001 From: Andrew Hutchings Date: Fri, 9 Aug 2019 11:51:55 +0100 Subject: [PATCH] MCOL-104 Remove InfiniDB Engine Remove the InfiniDB engine which is a duplicate of the ColumnStore engine. --- dbcon/execplan/calpontsystemcatalog.cpp | 2 +- dbcon/execplan/pseudocolumn.cpp | 2 +- dbcon/execplan/simplecolumn.cpp | 2 +- dbcon/mysql/ha_calpont.cpp | 73 ------------------------- dbcon/mysql/install_calpont_mysql.sh | 1 - dbcon/mysql/syscatalog_mysql.sql | 7 ++- writeengine/bulk/cpimport.cpp | 2 +- 7 files changed, 9 insertions(+), 80 deletions(-) diff --git a/dbcon/execplan/calpontsystemcatalog.cpp b/dbcon/execplan/calpontsystemcatalog.cpp index 234fb6235..2f62ec1e5 100644 --- a/dbcon/execplan/calpontsystemcatalog.cpp +++ b/dbcon/execplan/calpontsystemcatalog.cpp @@ -5649,7 +5649,7 @@ const string CalpontSystemCatalog::TableName::toString() const ostream& operator<<(ostream& os, const CalpontSystemCatalog::TableAliasName& rhs) { os << rhs.schema << '.' << rhs.table << "(" << rhs.alias << "/" << rhs.view - << ") engineType=" << (rhs.fIsInfiniDB ? "Columnstore" : "ForeignEngine"); + << ") engineType=" << (rhs.fIsInfiniDB ? "ColumnStore" : "ForeignEngine"); return os; } diff --git a/dbcon/execplan/pseudocolumn.cpp b/dbcon/execplan/pseudocolumn.cpp index e2303fec4..e4305295f 100644 --- a/dbcon/execplan/pseudocolumn.cpp +++ b/dbcon/execplan/pseudocolumn.cpp @@ -155,7 +155,7 @@ const string PseudoColumn::toString() const << cardinality() << '/' << joinInfo() << '/' << colSource() << '/' - << (isInfiniDB() ? "InfiniDB" : "ForeignEngine") << endl; + << (isInfiniDB() ? "ColumnStore" : "ForeignEngine") << endl; output << "Pseudotype=" << fPseudoType << endl; return output.str(); diff --git a/dbcon/execplan/simplecolumn.cpp b/dbcon/execplan/simplecolumn.cpp index 68f09ee26..009ae2faf 100644 --- a/dbcon/execplan/simplecolumn.cpp +++ b/dbcon/execplan/simplecolumn.cpp @@ -264,7 +264,7 @@ const string SimpleColumn::toString() const << cardinality() << '/' << joinInfo() << '/' << colSource() << '/' - << (isInfiniDB() ? "InfiniDB" : "ForeignEngine") << '/' + << (isInfiniDB() ? "ColumnStore" : "ForeignEngine") << '/' << colPosition() << endl; return output.str(); diff --git a/dbcon/mysql/ha_calpont.cpp b/dbcon/mysql/ha_calpont.cpp index 525ac62b7..0e4ab9f58 100644 --- a/dbcon/mysql/ha_calpont.cpp +++ b/dbcon/mysql/ha_calpont.cpp @@ -149,39 +149,6 @@ static int columnstore_init_func(void* p) DBUG_RETURN(0); } -static int infinidb_init_func(void* p) -{ - DBUG_ENTER("infinidb_init_func"); - - struct tm tm; - time_t t; - - time(&t); - localtime_r(&t, &tm); - fprintf(stderr, "%02d%02d%02d %2d:%02d:%02d ", - tm.tm_year % 100, tm.tm_mon + 1, tm.tm_mday, - tm.tm_hour, tm.tm_min, tm.tm_sec); - - fprintf(stderr, "Columnstore: Started; Version: %s-%s\n", columnstore_version.c_str(), columnstore_release.c_str()); - - calpont_hton = (handlerton*)p; - - calpont_hton->state = SHOW_OPTION_YES; - calpont_hton->create = calpont_create_handler; - calpont_hton->flags = HTON_CAN_RECREATE; -// calpont_hton->discover_table= calpont_discover; -// calpont_hton->discover_table_existence= calpont_discover_existence; - calpont_hton->commit = calpont_commit; - calpont_hton->rollback = calpont_rollback; - calpont_hton->close_connection = calpont_close_connection; - calpont_hton->create_group_by = create_calpont_group_by_handler; - //calpont_hton->create_derived = create_columnstore_derived_handler; - calpont_hton->create_select = create_columnstore_select_handler; - - DBUG_RETURN(0); -} - - static int columnstore_done_func(void* p) { DBUG_ENTER("calpont_done_func"); @@ -193,13 +160,6 @@ static int columnstore_done_func(void* p) DBUG_RETURN(0); } -static int infinidb_done_func(void* p) -{ - DBUG_ENTER("calpont_done_func"); - - DBUG_RETURN(0); -} - static handler* calpont_create_handler(handlerton* hton, TABLE_SHARE* table, MEM_ROOT* mem_root) @@ -944,9 +904,6 @@ const COND* ha_calpont::cond_push(const COND* cond) struct st_mysql_storage_engine columnstore_storage_engine = { MYSQL_HANDLERTON_INTERFACE_VERSION }; -struct st_mysql_storage_engine infinidb_storage_engine = -{ MYSQL_HANDLERTON_INTERFACE_VERSION }; - #include "ha_mcs_pushdown.cpp" mysql_declare_plugin(columnstore) @@ -964,21 +921,6 @@ mysql_declare_plugin(columnstore) mcs_system_variables, /* system variables */ NULL, /* reserved */ 0 /* config flags */ -}, -{ - MYSQL_STORAGE_ENGINE_PLUGIN, - &infinidb_storage_engine, - "InfiniDB", - "MariaDB", - "Columnstore storage engine (deprecated: use columnstore)", - PLUGIN_LICENSE_GPL, - infinidb_init_func, /* Plugin Init */ - infinidb_done_func, /* Plugin Deinit */ - 0x0100 /* 1.0 */, - NULL, /* status variables */ - mcs_system_variables, /* system variables */ - NULL, /* reserved */ - 0 /* config flags */ } mysql_declare_plugin_end; maria_declare_plugin(columnstore) @@ -996,21 +938,6 @@ maria_declare_plugin(columnstore) mcs_system_variables, /* system variables */ "1.0", /* string version */ MariaDB_PLUGIN_MATURITY_STABLE /* maturity */ -}, -{ - MYSQL_STORAGE_ENGINE_PLUGIN, - &infinidb_storage_engine, - "InfiniDB", - "MariaDB", - "Columnstore storage engine (deprecated: use columnstore)", - PLUGIN_LICENSE_GPL, - infinidb_init_func, - infinidb_done_func, - 0x0100, /* 1.0 */ - NULL, /* status variables */ - mcs_system_variables, /* system variables */ - "1.0", /* string version */ - MariaDB_PLUGIN_MATURITY_STABLE /* maturity */ } maria_declare_plugin_end; diff --git a/dbcon/mysql/install_calpont_mysql.sh b/dbcon/mysql/install_calpont_mysql.sh index 2a7c79883..d6fc8fb4d 100755 --- a/dbcon/mysql/install_calpont_mysql.sh +++ b/dbcon/mysql/install_calpont_mysql.sh @@ -28,7 +28,6 @@ df=$installdir/mysql/my.cnf $installdir/mysql/bin/mysql --defaults-extra-file=$df --force --user=root mysql 2> ${tmpdir}/mysql_install.log <isSystemReady()) { startupError( std::string( - "System is not ready. Verify that InfiniDB is up and ready " + "System is not ready. Verify that ColumnStore is up and ready " "before running cpimport."), false ); }