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

Merge pull request #2741 from mariadb-corporation/MDEV-25080-CS-dev

Browse Source 
MDEV-25080 Allow pushdown of queries involving UNIONs in outer select to ColumnStore
This commit is contained in:
Roman Nozdrin
2023-02-28 11:23:50 +00:00
committed by GitHub
parent b267186f58 8bf545bc2e
commit 4d4e4ad30d
21 changed files with 989 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dbcon/execplan/calpontsystemcatalog.cpp
View File

@ -6393,12 +6393,13 @@ boost::any CalpontSystemCatalog::ColType::convertColumnData(const std::string& d
}
CalpontSystemCatalog::ColType CalpontSystemCatalog::ColType::convertUnionColType(
vector<CalpontSystemCatalog::ColType>& types)
vector<CalpontSystemCatalog::ColType>& types,
unsigned int& rc)
{
idbassert(types.size());
CalpontSystemCatalog::ColType unionedType = types[0];
for (uint64_t i = 1; i < types.size(); i++)
dataconvert::DataConvert::joinColTypeForUnion(unionedType, types[i]);
dataconvert::DataConvert::joinColTypeForUnion(unionedType, types[i], rc);
return unionedType;
}

2
dbcon/execplan/calpontsystemcatalog.h
View File

@ -306,7 +306,7 @@ class CalpontSystemCatalog : public datatypes::SystemCatalog
return !(*this == t);
}
static ColType convertUnionColType(std::vector<ColType>&);
static ColType convertUnionColType(std::vector<ColType>&, unsigned int&);
};
/** the structure of a table infomation