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

MCOL-6216: no QA for CS

Browse Source
This commit is contained in:
Leonid Fedorov
2025-10-20 15:57:22 +00:00
parent 18a4f01242
commit d00b849279
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/compiler_flags.cmake
View File

@@ -95,6 +95,14 @@ set(GNU_FLAGS # suppressed warnings
set(ASAN_FLAGS -U_FORTIFY_SOURCE -fsanitize=address -fsanitize-address-use-after-scope -fPIC) set(ASAN_FLAGS -U_FORTIFY_SOURCE -fsanitize=address -fsanitize-address-use-after-scope -fPIC)
# } end Sanitizers # } end Sanitizers
# Check if built with enterprise configuration
if(MYSQL_SERVER_SUFFIX STREQUAL "-enterprise")
message(STATUS "ColumnStore: Compiling with ENTERPRISE features enabled")
my_check_and_set_compiler_flag("-DCOLUMNSTORE_COMPILED_WITH_ENTERPRISE")
else()
message(STATUS "ColumnStore: Compiling with COMMUNITY features")
endif()
# configured by cmake/configureEngine.cmake { # configured by cmake/configureEngine.cmake {
if(MASK_LONGDOUBLE) if(MASK_LONGDOUBLE)
my_check_and_set_compiler_flag("-DMASK_LONGDOUBLE") my_check_and_set_compiler_flag("-DMASK_LONGDOUBLE")

16
dbcon/rbo/rulebased_optimizer.cpp
View File

@@ -76,6 +76,15 @@ bool optimizeCSEPWithRules(execplan::CalpontSelectExecutionPlan& root, const std
return changed; return changed;
} }
bool isEnterprise()
{
#ifdef COLUMNSTORE_COMPILED_WITH_ENTERPRISE
return true;
#else
return false;
#endif
}
// high level API call for optimizer // high level API call for optimizer
bool optimizeCSEP(execplan::CalpontSelectExecutionPlan& root, optimizer::RBOptimizerContext& ctx, bool optimizeCSEP(execplan::CalpontSelectExecutionPlan& root, optimizer::RBOptimizerContext& ctx,
bool useUnstableOptimizer) bool useUnstableOptimizer)
@@ -83,8 +92,11 @@ bool optimizeCSEP(execplan::CalpontSelectExecutionPlan& root, optimizer::RBOptim
std::vector<optimizer::Rule> rules; std::vector<optimizer::Rule> rules;
if (useUnstableOptimizer) if (useUnstableOptimizer)
{ {
optimizer::Rule parallelCES{"parallel_ces", optimizer::parallelCESFilter, optimizer::applyParallelCES}; if (isEnterprise())
rules.push_back(parallelCES); {
optimizer::Rule parallelCES{"parallel_ces", optimizer::parallelCESFilter, optimizer::applyParallelCES};
rules.push_back(parallelCES);
}
optimizer::Rule rewriteDistinct{"rewrite_distinct", optimizer::rewriteDistinctFilter, optimizer::Rule rewriteDistinct{"rewrite_distinct", optimizer::rewriteDistinctFilter,
optimizer::applyRewriteDistinct}; optimizer::applyRewriteDistinct};