database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +03:00
Code Activity

MCOL-4757 Empty set in SELECT * INFORMATION_SCHEMA.COLUMNSTORE_TABLES WHERE TABLE_NAME='t1'

Browse Source
This commit is contained in:
Alexander Barkov
2021-06-11 12:00:23 +04:00
parent 4ecd561878
commit d00ace2398
5 changed files with 177 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
dbcon/mysql/is_columnstore.h
View File

@ -21,3 +21,66 @@ int is_columnstore_extents_plugin_init(void* p);
int is_columnstore_files_plugin_init(void* p);
int is_columnstore_tables_plugin_init(void* p);
int is_columnstore_columns_plugin_init(void* p);
class InformationSchemaCond
{
StringBuffer<MAX_FIELD_WIDTH> mBufferTableName;
StringBuffer<MAX_FIELD_WIDTH> mBufferTableSchema;
String *mTableName;
String *mTableSchema;
public:
InformationSchemaCond()
:mBufferTableName(system_charset_info),
mBufferTableSchema(system_charset_info),
mTableName(nullptr),
mTableSchema(nullptr)
{ }
const String *tableName() const { return mTableName; }
const String *tableSchema() const { return mTableSchema; }
static bool eqName(const String &a, const std::string &b)
{
return a.length() == b.length() && !memcmp(a.ptr(), b.data(), a.length());
}
static bool eqName(const String *a, const std::string &b)
{
return !a || eqName(*a, b);
}
bool match(const std::string &schema, const std::string &table) const
{
return eqName(mTableName, table) && eqName(mTableSchema, schema);
}
void getCondItem(Item_field *item_field, Item *item_const)
{
if (strcasecmp(item_field->field_name.str, "table_name") == 0)
{
mTableName = item_const->val_str(&mBufferTableName);
}
else if (strcasecmp(item_field->field_name.str, "table_schema") == 0)
{
mTableSchema = item_const->val_str(&mBufferTableSchema);
}
}
void getCondItemBoolFunc2(Item_bool_func2 *func)
{
Item_field *field = dynamic_cast<Item_field*>(func->arguments()[0]->real_item());
if (field && func->arguments()[1]->const_item())
getCondItem(field, func->arguments()[1]);
}
void getCondItems(COND* cond)
{
if (Item_bool_func2 *func = dynamic_cast<Item_bool_func2*>(cond))
{
getCondItemBoolFunc2(func);
}
else if (Item_cond_and *subcond = dynamic_cast<Item_cond_and*>(cond))
{
List_iterator<Item> li(*(subcond)->argument_list());
for (Item *item = li++; item ; item = li++ )
getCondItems(item);
}
}
};

71
dbcon/mysql/is_columnstore_columns.cpp
View File

@ -57,62 +57,12 @@ ST_FIELD_INFO is_columnstore_columns_fields[] =
Show::CEnd()
};
static void get_cond_item(Item_func* item, String** table, String** db)
{
char tmp_char[MAX_FIELD_WIDTH];
Item_field* item_field = (Item_field*) item->arguments()[0]->real_item();
if (strcasecmp(item_field->field_name.str, "table_name") == 0)
{
String str_buf(tmp_char, sizeof(tmp_char), system_charset_info);
*table = item->arguments()[1]->val_str(&str_buf);
return;
}
else if (strcasecmp(item_field->field_name.str, "table_schema") == 0)
{
String str_buf(tmp_char, sizeof(tmp_char), system_charset_info);
*db = item->arguments()[1]->val_str(&str_buf);
return;
}
}
static void get_cond_items(COND* cond, String** table, String** db)
{
if (cond->type() == Item::FUNC_ITEM)
{
Item_func* fitem = (Item_func*) cond;
if (fitem->arguments()[0]->real_item()->type() == Item::FIELD_ITEM &&
fitem->arguments()[1]->const_item())
{
get_cond_item(fitem, table, db);
}
}
else if ((cond->type() == Item::COND_ITEM) && (((Item_cond*) cond)->functype() == Item_func::COND_AND_FUNC))
{
List_iterator<Item> li(*((Item_cond*) cond)->argument_list());
Item* item;
while ((item = li++))
{
if (item->type() == Item::FUNC_ITEM)
{
get_cond_item((Item_func*)item, table, db);
}
else
{
get_cond_items(item, table, db);
}
}
}
}
static int is_columnstore_columns_fill(THD* thd, TABLE_LIST* tables, COND* cond)
{
CHARSET_INFO* cs = system_charset_info;
TABLE* table = tables->table;
String* table_name = NULL;
String* db_name = NULL;
InformationSchemaCond isCond;
boost::shared_ptr<execplan::CalpontSystemCatalog> systemCatalogPtr =
execplan::CalpontSystemCatalog::makeCalpontSystemCatalog(execplan::CalpontSystemCatalog::idb_tid2sid(thd->thread_id));
@ -124,27 +74,14 @@ static int is_columnstore_columns_fill(THD* thd, TABLE_LIST* tables, COND* cond)
if (cond)
{
get_cond_items(cond, &table_name, &db_name);
isCond.getCondItems(cond);
}
for (std::vector<std::pair<execplan::CalpontSystemCatalog::OID, execplan::CalpontSystemCatalog::TableName> >::const_iterator it = catalog_tables.begin();
it != catalog_tables.end(); ++it)
{
if (db_name)
{
if ((*it).second.schema.compare(db_name->ptr()) != 0)
{
continue;
}
}
if (table_name)
{
if ((*it).second.table.compare(table_name->ptr()) != 0)
{
continue;
}
}
if (!isCond.match((*it).second.schema, (*it).second.table))
continue;
execplan::CalpontSystemCatalog::RIDList column_rid_list;

71
dbcon/mysql/is_columnstore_tables.cpp
View File

@ -43,62 +43,12 @@ ST_FIELD_INFO is_columnstore_tables_fields[] =
Show::CEnd()
};
static void get_cond_item(Item_func* item, String** table, String** db)
{
char tmp_char[MAX_FIELD_WIDTH];
Item_field* item_field = (Item_field*) item->arguments()[0]->real_item();
if (strcasecmp(item_field->field_name.str, "table_name") == 0)
{
String str_buf(tmp_char, sizeof(tmp_char), system_charset_info);
*table = item->arguments()[1]->val_str(&str_buf);
return;
}
else if (strcasecmp(item_field->field_name.str, "table_schema") == 0)
{
String str_buf(tmp_char, sizeof(tmp_char), system_charset_info);
*db = item->arguments()[1]->val_str(&str_buf);
return;
}
}
static void get_cond_items(COND* cond, String** table, String** db)
{
if (cond->type() == Item::FUNC_ITEM)
{
Item_func* fitem = (Item_func*) cond;
if (fitem->arguments()[0]->real_item()->type() == Item::FIELD_ITEM &&
fitem->arguments()[1]->const_item())
{
get_cond_item(fitem, table, db);
}
}
else if ((cond->type() == Item::COND_ITEM) && (((Item_cond*) cond)->functype() == Item_func::COND_AND_FUNC))
{
List_iterator<Item> li(*((Item_cond*) cond)->argument_list());
Item* item;
while ((item = li++))
{
if (item->type() == Item::FUNC_ITEM)
{
get_cond_item((Item_func*)item, table, db);
}
else
{
get_cond_items(item, table, db);
}
}
}
}
static int is_columnstore_tables_fill(THD* thd, TABLE_LIST* tables, COND* cond)
{
CHARSET_INFO* cs = system_charset_info;
TABLE* table = tables->table;
String* table_name = NULL;
String* db_name = NULL;
InformationSchemaCond isCond;
boost::shared_ptr<execplan::CalpontSystemCatalog> systemCatalogPtr =
execplan::CalpontSystemCatalog::makeCalpontSystemCatalog(execplan::CalpontSystemCatalog::idb_tid2sid(thd->thread_id));
@ -107,7 +57,7 @@ static int is_columnstore_tables_fill(THD* thd, TABLE_LIST* tables, COND* cond)
if (cond)
{
get_cond_items(cond, &table_name, &db_name);
isCond.getCondItems(cond);
}
const std::vector< std::pair<execplan::CalpontSystemCatalog::OID, execplan::CalpontSystemCatalog::TableName> > catalog_tables
@ -116,21 +66,8 @@ static int is_columnstore_tables_fill(THD* thd, TABLE_LIST* tables, COND* cond)
for (std::vector<std::pair<execplan::CalpontSystemCatalog::OID, execplan::CalpontSystemCatalog::TableName> >::const_iterator it = catalog_tables.begin();
it != catalog_tables.end(); ++it)
{
if (db_name)
{
if ((*it).second.schema.compare(db_name->ptr()) != 0)
{
continue;
}
}
if (table_name)
{
if ((*it).second.table.compare(table_name->ptr()) != 0)
{
continue;
}
}
if (!isCond.match((*it).second.schema, (*it).second.table))
continue;
try
{