database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
Code Activity

MCOL-2 Update engine name to columnstore part 2

Browse Source
This commit is contained in:
David Hall
2016-05-18 17:31:44 -05:00
parent 80437a0083
commit eb36fa5e7e
3 changed files with 47 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/releasenum
View File

@ -1,5 +1,5 @@
#
version=5.0
version=1.0
release=0

66
dbcon/mysql/ha_calpont.cpp
View File

@ -188,9 +188,9 @@ int calpont_discover_existence(handlerton *hton, const char *db,
return ha_calpont_impl_discover_existence(db, table_name);
}
static int calpont_init_func(void *p)
static int columnstore_init_func(void *p)
{
DBUG_ENTER("calpont_init_func");
DBUG_ENTER("columnstore_init_func");
struct tm tm;
time_t t;
@ -222,8 +222,37 @@ static int calpont_init_func(void *p)
DBUG_RETURN(0);
}
static int infinidb_init_func(void *p)
{
DBUG_ENTER("infinidb_init_func");
static int calpont_done_func(void *p)
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, "InfiniDB: Started; Version: %s-%s\n", idb_version.c_str(), idb_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->set_error= calpont_set_error;
DBUG_RETURN(0);
}
static int columnstore_done_func(void *p)
{
DBUG_ENTER("calpont_done_func");
@ -234,6 +263,12 @@ static int calpont_done_func(void *p)
DBUG_RETURN(0);
}
static int infinidb_done_func(void *p)
{
DBUG_ENTER("calpont_done_func");
DBUG_RETURN(0);
}
#if 0
/**
@ -1106,8 +1141,8 @@ mysql_declare_plugin(columnstore)
"MariaDB",
"Columnstore storage engine",
PLUGIN_LICENSE_GPL,
calpont_init_func, /* Plugin Init */
calpont_done_func, /* Plugin Deinit */
columnstore_init_func, /* Plugin Init */
columnstore_done_func, /* Plugin Deinit */
0x0100 /* 1.0 */,
NULL, /* status variables */
calpont_system_variables, /* system variables */
@ -1121,8 +1156,8 @@ mysql_declare_plugin(columnstore)
"MariaDB",
"Columnstore storage engine (deprecated: use columnstore)",
PLUGIN_LICENSE_GPL,
calpont_init_func, /* Plugin Init */
calpont_done_func, /* Plugin Deinit */
infinidb_init_func, /* Plugin Init */
infinidb_done_func, /* Plugin Deinit */
0x0100 /* 1.0 */,
NULL, /* status variables */
calpont_system_variables, /* system variables */
@ -1130,21 +1165,4 @@ mysql_declare_plugin(columnstore)
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

4
dbcon/mysql/ha_calpont_execplan.cpp
View File

@ -4003,7 +4003,7 @@ void gp_walk(const Item *item, void *arg)
enum Item_func::Functype ftype = func->functype();
bool isOr = (ftype == Item_func::COND_OR_FUNC);
bool isXor = (ftype == Item_func::XOR_FUNC);
bool isXor = (ftype == Item_func::XOR_FUNC);
List<Item> *argumentList;
List<Item> xorArgumentList;
@ -4020,13 +4020,13 @@ void gp_walk(const Item *item, void *arg)
argumentList = ((Item_cond*)item)->argument_list();
}
List_iterator_fast<Item> li(*argumentList);
// @bug2932. if ptWorkStack contains less items than the condition's arguments,
// the missing one should be in the rcWorkStack, unless the it's subselect.
// @todo need to figure out a way to combine these two stacks while walking.
//if (gwip->ptWorkStack.size() < icp->argument_list()->elements)
{
List_iterator_fast<Item> li(*argumentList);
while (Item *it= li++)
{
//@bug3495, @bug5865 error out non-supported OR with correlated subquery