database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-11-03 17:13:17 +03:00
Code Activity

fix(crash, plugin), chore(ci): catch missed exception, set FE identity, install dgb_symbols

Browse Source
This commit is contained in:
Leonid Fedorov
2025-09-01 16:52:11 +00:00
committed by Leonid Fedorov
parent 3fea9bf825
commit 6e464bcd18
2 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
build/prepare_test_container.sh
View File

@@ -130,7 +130,8 @@ prepare_container() {
if [[ "$RESULT" == *rocky* ]]; then if [[ "$RESULT" == *rocky* ]]; then
execInnerDockerWithRetry "$CONTAINER_NAME" 'yum install -y MariaDB-columnstore-engine MariaDB-test' execInnerDockerWithRetry "$CONTAINER_NAME" 'yum install -y MariaDB-columnstore-engine MariaDB-test'
else else
execInnerDockerWithRetry "$CONTAINER_NAME" 'apt update -y && apt install -y mariadb-plugin-columnstore mariadb-test mariadb-test-data mariadb-plugin-columnstore-dbgsym' #TODO think about server version!
execInnerDockerWithRetry "$CONTAINER_NAME" 'apt update -y && apt install -y mariadb-plugin-columnstore mariadb-test mariadb-test-data mariadb-plugin-columnstore-dbgsym mariadb-client-10.6-dbgsym mariadb-client-core-10.6-dbgsym mariadb-server-10.6-dbgsym mariadb-server-core-10.6-dbgsym mariadb-test-dbgsym '
fi fi
sleep 5 sleep 5

21
dbcon/mysql/is_columnstore_columns.cpp
View File

@@ -62,12 +62,25 @@ static int is_columnstore_columns_fill(THD* thd, TABLE_LIST* tables, COND* cond)
InformationSchemaCond isCond; InformationSchemaCond isCond;
execplan::CalpontSystemCatalog csc; execplan::CalpontSystemCatalog csc;
const std::vector< // Use FE path for syscat queries issued from mysqld
std::pair<execplan::CalpontSystemCatalog::OID, execplan::CalpontSystemCatalog::TableName> >
catalog_tables = csc.getTables();
csc.identity(execplan::CalpontSystemCatalog::FE); csc.identity(execplan::CalpontSystemCatalog::FE);
std::vector<
std::pair<execplan::CalpontSystemCatalog::OID, execplan::CalpontSystemCatalog::TableName> >
catalog_tables;
try
{
catalog_tables = csc.getTables("", lower_case_table_names);
}
catch (IDBExcept&)
{
return 1;
}
catch (std::exception&)
{
return 1;
}
if (cond) if (cond)
{ {
isCond.getCondItems(cond); isCond.getCondItems(cond);