database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-01 06:46:55 +03:00
Code Activity

MCOL-2 Update engine name to columnstore

Browse Source
This commit is contained in:
David Hall
2016-05-18 17:28:50 -05:00
parent 94a3174688
commit 80437a0083
12 changed files with 75 additions and 9801 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
dbcon/mysql/ha_calpont.cpp
View File

@ -201,7 +201,7 @@ static int calpont_init_func(void *p)
tm.tm_year % 100, tm.tm_mon + 1, tm.tm_mday,
tm.tm_hour, tm.tm_min, tm.tm_sec);
fprintf(stderr, "InfiniDB: Started; Version: %s-%s\n", idb_version.c_str(), idb_release.c_str());
fprintf(stderr, "Columnstore: Started; Version: %s-%s\n", idb_version.c_str(), idb_release.c_str());
calpont_hton= (handlerton *)p;
#ifndef _MSC_VER
@ -1048,6 +1048,9 @@ 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 };
@ -1095,19 +1098,53 @@ static struct st_mysql_sys_var* calpont_system_variables[]= {
NULL
};
mysql_declare_plugin(calpont)
mysql_declare_plugin(columnstore)
{
MYSQL_STORAGE_ENGINE_PLUGIN,
&columnstore_storage_engine,
"Columnstore",
"MariaDB",
"Columnstore storage engine",
PLUGIN_LICENSE_GPL,
calpont_init_func, /* Plugin Init */
calpont_done_func, /* Plugin Deinit */
0x0100 /* 1.0 */,
NULL, /* status variables */
calpont_system_variables, /* system variables */
NULL, /* reserved */
0 /* config flags */
},
{
MYSQL_STORAGE_ENGINE_PLUGIN,
&infinidb_storage_engine,
"InfiniDB",
"InfiniDB, Inc.",
"InfiniDB storage engine",
"MariaDB",
"Columnstore storage engine (deprecated: use columnstore)",
PLUGIN_LICENSE_GPL,
calpont_init_func, /* Plugin Init */
calpont_done_func, /* Plugin Deinit */
0x0001 /* 0.1 */,
0x0100 /* 1.0 */,
NULL, /* status variables */
calpont_system_variables, /* system variables */
NULL /* config options */
NULL, /* reserved */
0 /* config flags */
}
mysql_declare_plugin_end;
#if 0
{
MYSQL_STORAGE_ENGINE_PLUGIN,
&columnstore_storage_engine,
"columnstore",
"MariaDB",
"Columnstore storage engine",
PLUGIN_LICENSE_GPL,
calpont_init_func, /* Plugin Init */
calpont_done_func, /* Plugin Deinit */
0x0100 /* 1.0 */,
NULL, /* status variables */
calpont_system_variables, /* system variables */
NULL, /* reserved */
0 /* config flags */
},
#endif

24
dbcon/mysql/ha_calpont_ddl.cpp
View File

@ -684,7 +684,7 @@ int ProcessDDLStatement(string& ddlStatement, string& schema, const string& tabl
rc = 1;
thd->get_stmt_da()->set_overwrite_status(true);
thd->raise_error_printf(ER_CHECK_NOT_IMPLEMENTED, "Varbinary is currently not supported by InfiniDB.");
thd->raise_error_printf(ER_CHECK_NOT_IMPLEMENTED, "Varbinary is currently not supported by Columnstore.");
ci->alterTableState = cal_connection_info::NOT_ALTER;
ci->isAlter = false;
return rc;
@ -901,7 +901,7 @@ int ProcessDDLStatement(string& ddlStatement, string& schema, const string& tabl
if ((compressionType ==0) && (useHdfs))
{
compressionType = 2;
string errmsg ("The table is created with infinidb compression type 2 under HDFS." );
string errmsg ("The table is created with Columnstore compression type 2 under HDFS." );
push_warning(thd, Sql_condition::WARN_LEVEL_WARN, 9999, errmsg.c_str());
}
@ -950,7 +950,7 @@ int ProcessDDLStatement(string& ddlStatement, string& schema, const string& tabl
rc = 1;
thd->get_stmt_da()->set_overwrite_status(true);
thd->raise_error_printf(ER_CHECK_NOT_IMPLEMENTED, "Multiple actions in alter table statement is currently not supported by InfiniDB.");
thd->raise_error_printf(ER_CHECK_NOT_IMPLEMENTED, "Multiple actions in alter table statement is currently not supported by Columnstore.");
ci->alterTableState = cal_connection_info::NOT_ALTER;
ci->isAlter = false;
@ -966,7 +966,7 @@ int ProcessDDLStatement(string& ddlStatement, string& schema, const string& tabl
{
rc = 1;
thd->get_stmt_da()->set_overwrite_status(true);
thd->raise_error_printf(ER_CHECK_NOT_IMPLEMENTED, "Varbinary is currently not supported by InfiniDB.");
thd->raise_error_printf(ER_CHECK_NOT_IMPLEMENTED, "Varbinary is currently not supported by Columnstore.");
ci->alterTableState = cal_connection_info::NOT_ALTER;
ci->isAlter = false;
return rc;
@ -1149,7 +1149,7 @@ int ProcessDDLStatement(string& ddlStatement, string& schema, const string& tabl
if ((compressionType ==0) && (useHdfs))
{
compressionType = 2;
string errmsg ("The column is created with infinidb compression type 2 under HDFS." );
string errmsg ("The column is created with Columnstore compression type 2 under HDFS." );
push_warning(thd, Sql_condition::WARN_LEVEL_WARN, 9999, errmsg.c_str());
}
@ -1285,7 +1285,7 @@ int ProcessDDLStatement(string& ddlStatement, string& schema, const string& tabl
{
rc = 1;
thd->get_stmt_da()->set_overwrite_status(true);
thd->raise_error_printf(ER_CHECK_NOT_IMPLEMENTED, "Multiple actions in alter table statement is currently not supported by InfiniDB.");
thd->raise_error_printf(ER_CHECK_NOT_IMPLEMENTED, "Multiple actions in alter table statement is currently not supported by Columnstore.");
ci->alterTableState = cal_connection_info::NOT_ALTER;
ci->isAlter = false;
return rc;
@ -1296,7 +1296,7 @@ int ProcessDDLStatement(string& ddlStatement, string& schema, const string& tabl
{
rc = 1;
thd->get_stmt_da()->set_overwrite_status(true);
thd->raise_error_printf(ER_CHECK_NOT_IMPLEMENTED, "Varbinary is currently not supported by InfiniDB.");
thd->raise_error_printf(ER_CHECK_NOT_IMPLEMENTED, "Varbinary is currently not supported by Columnstore.");
ci->alterTableState = cal_connection_info::NOT_ALTER;
ci->isAlter = false;
return rc;
@ -1473,7 +1473,7 @@ int ProcessDDLStatement(string& ddlStatement, string& schema, const string& tabl
if ((compressionType ==0) && (useHdfs))
{
compressionType = 2;
string errmsg ("The column is created with infinidb compression type 2 under HDFS." );
string errmsg ("The column is created with Columnstore compression type 2 under HDFS." );
push_warning(thd, Sql_condition::WARN_LEVEL_WARN, 9999, errmsg.c_str());
}
@ -1614,7 +1614,7 @@ int ProcessDDLStatement(string& ddlStatement, string& schema, const string& tabl
if ((compressionType ==0) && (useHdfs))
{
compressionType = 2;
string errmsg ("The column is created with infinidb compression type 2 under HDFS." );
string errmsg ("The column is created with Columnstore compression type 2 under HDFS." );
push_warning(thd, Sql_condition::WARN_LEVEL_WARN, 9999, errmsg.c_str());
}
@ -1853,14 +1853,14 @@ int ProcessDDLStatement(string& ddlStatement, string& schema, const string& tabl
algorithm::to_upper(ddlStatement);
if (ddlStatement.find("AUTO_INCREMENT") != string::npos)
{
thd->raise_error_printf(ER_CHECK_NOT_IMPLEMENTED, "Use of the MySQL auto_increment syntax is not supported in InfiniDB. If you wish to create an auto increment column in InfiniDB, please consult the InfiniDB SQL Syntax Guide for the correct usage.");
thd->raise_error_printf(ER_CHECK_NOT_IMPLEMENTED, "Use of the MySQL auto_increment syntax is not supported in Columnstore. If you wish to create an auto increment column in Columnstore, please consult the Columnstore SQL Syntax Guide for the correct usage.");
ci->alterTableState = cal_connection_info::NOT_ALTER;
ci->isAlter = false;
}
else
{
//@Bug 1888,1885. update error message
thd->raise_error_printf(ER_CHECK_NOT_IMPLEMENTED, "The syntax or the data type(s) is not supported by InfiniDB. Please check the InfiniDB syntax guide for supported syntax or data types.");
thd->raise_error_printf(ER_CHECK_NOT_IMPLEMENTED, "The syntax or the data type(s) is not supported by Columnstore. Please check the Columnstore syntax guide for supported syntax or data types.");
ci->alterTableState = cal_connection_info::NOT_ALTER;
ci->isAlter = false;
}
@ -2057,7 +2057,7 @@ int ha_calpont_impl_create_(const char *name, TABLE *table_arg, HA_CREATE_INFO *
if ((compressiontype ==0) && (useHdfs))
{
compressiontype = 2;
string errmsg ("The table is created with infinidb compression type 2 under HDFS." );
string errmsg ("The table is created with Columnstore compression type 2 under HDFS." );
push_warning(thd, Sql_condition::WARN_LEVEL_WARN, 9999, errmsg.c_str());
}

2
dbcon/mysql/ha_calpont_execplan.cpp
View File

@ -4469,7 +4469,7 @@ bool isInfiniDB(TABLE* table_ptr)
string engineName = table_ptr->s->db_plugin->name.str;
#endif
if (engineName == "InfiniDB")
if (engineName == "Columnstore" || engineName == "InfiniDB")
return true;
else
return false;

26
dbcon/mysql/ha_calpont_impl.cpp
View File

@ -782,7 +782,7 @@ uint32_t doUpdateDelete(THD *thd)
ci->stats.userPriority(ci->stats.fHost, ci->stats.fUser);
} catch (std::exception& e)
{
string msg = string("InfiniDB User Priority - ") + e.what();
string msg = string("Columnstore User Priority - ") + e.what();
push_warning(thd, Sql_condition::WARN_LEVEL_WARN, 9999, msg.c_str());
}
ci->stats.fSessionID = tid2sid(thd->thread_id);
@ -1259,7 +1259,7 @@ uint32_t doUpdateDelete(THD *thd)
updateCP->priority( ci->stats.userPriority(ci->stats.fHost, ci->stats.fUser));
}catch(std::exception& e)
{
string msg = string("InfiniDB User Priority - ") + e.what();
string msg = string("Columnstore User Priority - ") + e.what();
push_warning(thd, Sql_condition::WARN_LEVEL_WARN, 9999, msg.c_str());
}
@ -1688,7 +1688,7 @@ uint32_t doUpdateDelete(THD *thd)
}
catch (std::exception& e)
{
string msg = string("InfiniDB Query Stats - ") + e.what();
string msg = string("Columnstore Query Stats - ") + e.what();
push_warning(thd, Sql_condition::WARN_LEVEL_WARN, 9999, msg.c_str());
}
delete ci->dmlProc;
@ -2388,7 +2388,7 @@ int ha_calpont_impl_rnd_init(TABLE* table)
// @bug 3939. Only error out for sp with select. Let pass for alter table in sp.
if (thd->infinidb_vtable.call_sp && (thd->lex)->sql_command != SQLCOM_ALTER_TABLE)
{
setError(thd, ER_CHECK_NOT_IMPLEMENTED, "This stored procedure syntax is not supported by InfiniDB in this version");
setError(thd, ER_CHECK_NOT_IMPLEMENTED, "This stored procedure syntax is not supported by Columnstore in this version");
thd->infinidb_vtable.vtable_state = THD::INFINIDB_ERROR;
return ER_INTERNAL_ERROR;
}
@ -2552,7 +2552,7 @@ int ha_calpont_impl_rnd_init(TABLE* table)
ci->stats.userPriority(ci->stats.fHost, ci->stats.fUser);
} catch (std::exception& e)
{
string msg = string("InfiniDB User Priority - ") + e.what();
string msg = string("Columnstore User Priority - ") + e.what();
ci->warningMsg = msg;
}
@ -2622,7 +2622,7 @@ int ha_calpont_impl_rnd_init(TABLE* table)
csep->priority( ci->stats.userPriority(ci->stats.fHost, ci->stats.fUser));
}catch (std::exception& e)
{
string msg = string("InfiniDB User Priority - ") + e.what();
string msg = string("Columnstore User Priority - ") + e.what();
push_warning(thd, Sql_condition::WARN_LEVEL_WARN, 9999, msg.c_str());
}
@ -2701,7 +2701,7 @@ int ha_calpont_impl_rnd_init(TABLE* table)
ci->stats.insert();
} catch (std::exception& e)
{
string msg = string("InfiniDB Query Stats - ") + e.what();
string msg = string("Columnstore Query Stats - ") + e.what();
push_warning(thd, Sql_condition::WARN_LEVEL_WARN, 9999, msg.c_str());
}
}
@ -2878,7 +2878,7 @@ int ha_calpont_impl_rnd_next(uchar *buf, TABLE* table)
// @bug 3939. Only error out for sp with select. Let pass for alter table in sp.
if (thd->infinidb_vtable.call_sp && (thd->lex)->sql_command != SQLCOM_ALTER_TABLE)
{
setError(thd, ER_CHECK_NOT_IMPLEMENTED, "This stored procedure syntax is not supported by InfiniDB in this version");
setError(thd, ER_CHECK_NOT_IMPLEMENTED, "This stored procedure syntax is not supported by Columnstore in this version");
thd->infinidb_vtable.vtable_state = THD::INFINIDB_ERROR;
return ER_INTERNAL_ERROR;
}
@ -3081,7 +3081,7 @@ int ha_calpont_impl_rnd_end(TABLE* table)
{
if (e.errorCode() == ERR_CROSS_ENGINE_CONNECT || e.errorCode() == ERR_CROSS_ENGINE_CONFIG)
{
string msg = string("InfiniDB Query Stats - ") + e.what();
string msg = string("Columnstore Query Stats - ") + e.what();
push_warning(thd, Sql_condition::WARN_LEVEL_WARN, 9999, msg.c_str());
}
else
@ -3305,7 +3305,7 @@ void ha_calpont_impl_start_bulk_insert(ha_rows rows, TABLE* table)
//@bug 4771. reject REPLACE key word
if ((thd->lex)->sql_command == SQLCOM_REPLACE_SELECT)
{
setError(current_thd, ER_CHECK_NOT_IMPLEMENTED, "REPLACE statement is not supported in infinidb.");
setError(current_thd, ER_CHECK_NOT_IMPLEMENTED, "REPLACE statement is not supported in Columnstore.");
}
boost::shared_ptr<CalpontSystemCatalog> csc = CalpontSystemCatalog::makeCalpontSystemCatalog(tid2sid(thd->thread_id));
@ -3324,7 +3324,7 @@ void ha_calpont_impl_start_bulk_insert(ha_rows rows, TABLE* table)
found = insertStmt.find("ignore");
if (found!=string::npos)
{
setError(current_thd, ER_CHECK_NOT_IMPLEMENTED, "IGNORE option in insert statement is not supported in infinidb.");
setError(current_thd, ER_CHECK_NOT_IMPLEMENTED, "IGNORE option in insert statement is not supported in Columnstore.");
}
if ( rows > 1 )
@ -3731,7 +3731,7 @@ void ha_calpont_impl_start_bulk_insert(ha_rows rows, TABLE* table)
ci->stats.userPriority(ci->stats.fHost, ci->stats.fUser);
} catch (std::exception& e)
{
string msg = string("InfiniDB User Priority - ") + e.what();
string msg = string("Columnstore User Priority - ") + e.what();
push_warning(thd, Sql_condition::WARN_LEVEL_WARN, 9999, msg.c_str());
}
@ -3985,7 +3985,7 @@ int ha_calpont_impl_end_bulk_insert(bool abort, TABLE* table)
ci->stats.insert();
} catch (std::exception& e)
{
string msg = string("InfiniDB Query Stats - ") + e.what();
string msg = string("Columnstore Query Stats - ") + e.what();
push_warning(thd, Sql_condition::WARN_LEVEL_WARN, 9999, msg.c_str());
}
}