MCOL-104 Remove InfiniDB Engine

Remove the InfiniDB engine which is a duplicate of the ColumnStore
engine.

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;
 }
 

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();

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();

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;
 

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 <<EOD
 INSTALL PLUGIN columnstore SONAME 'libcalmysql.so';
-INSTALL PLUGIN infinidb SONAME 'libcalmysql.so';
 INSTALL PLUGIN columnstore_tables SONAME 'is_columnstore_tables.so';
 INSTALL PLUGIN columnstore_columns SONAME 'is_columnstore_columns.so';
 INSTALL PLUGIN columnstore_extents SONAME 'is_columnstore_extents.so';

dbcon/mysql/syscatalog_mysql.sql

@@ -3,6 +3,9 @@ create database if not exists calpontsys;
 
 use calpontsys;
 
+drop table if exists systable restrict;
+drop table if exists syscolumn restrict;
+
 create table if not exists systable (tablename varchar(128),
                        `schema` varchar(128),
                        objectid int,
@@ -13,7 +16,7 @@ create table if not exists systable (tablename varchar(128),
                        numofrows int,
                        avgrowlen int,
                        numofblocks int,
-					   autoincrement int) engine=infinidb comment='SCHEMA SYNC ONLY';
+					   autoincrement int) engine=columnstore comment='SCHEMA SYNC ONLY';
 
 -- SYSCOLUMN
 create table if not exists syscolumn (`schema` varchar(128),
@@ -37,4 +40,4 @@ create table if not exists syscolumn (`schema` varchar(128),
                         minvalue varchar(64),
                         `maxvalue` varchar(64),
                         compressiontype integer,
-						nextvalue bigint) engine=infinidb comment='SCHEMA SYNC ONLY';
+						nextvalue bigint) engine=columnstore comment='SCHEMA SYNC ONLY';

writeengine/bulk/cpimport.cpp

@@ -1165,7 +1165,7 @@ int main(int argc, char** argv)
         if (!BRMWrapper::getInstance()->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 );
         }