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

feat(optimizer): add fixed bounds for TPC-H 1GB from regr

Browse Source
This commit is contained in:
drrtuy
2025-06-27 13:45:41 +00:00
parent ca799dc709
commit 2776e193d1
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
dbcon/mysql/rulebased_optimizer.cpp
View File

@@ -23,6 +23,8 @@
#include "predicateoperator.h" #include "predicateoperator.h"
#include "simplefilter.h" #include "simplefilter.h"
#include "rulebased_optimizer.h" #include "rulebased_optimizer.h"
#include <cstdint>
#include <limits>
namespace optimizer namespace optimizer
{ {
@@ -128,7 +130,8 @@ bool matchParallelCES(execplan::CalpontSelectExecutionPlan& csep)
// This routine produces a new ParseTree that is AND(lowerBand <= column, column <= upperBand) // This routine produces a new ParseTree that is AND(lowerBand <= column, column <= upperBand)
// TODO add engine-independent statistics-derived ranges // TODO add engine-independent statistics-derived ranges
execplan::ParseTree* filtersWithNewRangeAddedIfNeeded(execplan::SCSEP& csep) execplan::ParseTree* filtersWithNewRangeAddedIfNeeded(execplan::SCSEP& csep,
std::pair<uint64_t, uint64_t>& bound)
{ {
// INV this is SimpleColumn we supply as an argument // INV this is SimpleColumn we supply as an argument
// TODO find the suitable column using EI statistics. // TODO find the suitable column using EI statistics.
@@ -139,10 +142,11 @@ execplan::ParseTree* filtersWithNewRangeAddedIfNeeded(execplan::SCSEP& csep)
tableKeyColumnLeftOp->resultType(column->resultType()); tableKeyColumnLeftOp->resultType(column->resultType());
// TODO Nobody owns this allocation and cleanup only depends on delete in ParseTree nodes' dtors. // TODO Nobody owns this allocation and cleanup only depends on delete in ParseTree nodes' dtors.
auto* filterColLeftOp = new execplan::ConstantColumnUInt(42ULL, 0, 0); auto* filterColLeftOp = new execplan::ConstantColumnUInt(bound.second, 0, 0);
// set TZ // set TZ
// There is a question with ownership of the const column // There is a question with ownership of the const column
execplan::SOP ltOp = boost::make_shared<execplan::Operator>(execplan::PredicateOperator("<=")); // WIP here we lost upper bound value if predicate is not changed to weak lt
execplan::SOP ltOp = boost::make_shared<execplan::Operator>(execplan::PredicateOperator("<"));
ltOp->setOpType(filterColLeftOp->resultType(), tableKeyColumnLeftOp->resultType()); ltOp->setOpType(filterColLeftOp->resultType(), tableKeyColumnLeftOp->resultType());
ltOp->resultType(ltOp->operationType()); ltOp->resultType(ltOp->operationType());
@@ -151,7 +155,7 @@ execplan::ParseTree* filtersWithNewRangeAddedIfNeeded(execplan::SCSEP& csep)
auto tableKeyColumnRightOp = new execplan::SimpleColumn(*column); auto tableKeyColumnRightOp = new execplan::SimpleColumn(*column);
tableKeyColumnRightOp->resultType(column->resultType()); tableKeyColumnRightOp->resultType(column->resultType());
// TODO hardcoded column type and value // TODO hardcoded column type and value
auto* filterColRightOp = new execplan::ConstantColumnUInt(30ULL, 0, 0); auto* filterColRightOp = new execplan::ConstantColumnUInt(bound.first, 0, 0);
execplan::SOP gtOp = boost::make_shared<execplan::Operator>(execplan::PredicateOperator(">=")); execplan::SOP gtOp = boost::make_shared<execplan::Operator>(execplan::PredicateOperator(">="));
gtOp->setOpType(filterColRightOp->resultType(), tableKeyColumnRightOp->resultType()); gtOp->setOpType(filterColRightOp->resultType(), tableKeyColumnRightOp->resultType());
@@ -179,11 +183,13 @@ execplan::CalpontSelectExecutionPlan::SelectList makeUnionFromTable(
{ {
execplan::CalpontSelectExecutionPlan::SelectList unionVec; execplan::CalpontSelectExecutionPlan::SelectList unionVec;
unionVec.reserve(numberOfLegs); unionVec.reserve(numberOfLegs);
for (size_t i = 0; i < numberOfLegs; ++i) std::vector<std::pair<uint64_t, uint64_t>> bounds({{0, 3000961},
{3000961, std::numeric_limits<uint64_t>::max()}});
for (auto bound : bounds)
{ {
auto clonedCSEP = csep.cloneWORecursiveSelects(); auto clonedCSEP = csep.cloneWORecursiveSelects();
// Add BETWEEN based on key column range // Add BETWEEN based on key column range
clonedCSEP->filters(filtersWithNewRangeAddedIfNeeded(clonedCSEP)); clonedCSEP->filters(filtersWithNewRangeAddedIfNeeded(clonedCSEP, bound));
unionVec.push_back(clonedCSEP); unionVec.push_back(clonedCSEP);
} }
@@ -236,7 +242,7 @@ void applyParallelCES(execplan::CalpontSelectExecutionPlan& csep)
newDerivedTableList.push_back(derivedSCEP); newDerivedTableList.push_back(derivedSCEP);
execplan::CalpontSystemCatalog::TableAliasName tn = execplan::make_aliasview("", "", tableAlias, ""); execplan::CalpontSystemCatalog::TableAliasName tn = execplan::make_aliasview("", "", tableAlias, "");
newTableList.push_back(tn); newTableList.push_back(tn);
// Remove the filters as they were pushed down to union units // Remove the filters as they were pushed down to union units
derivedSCEP->filters(nullptr); derivedSCEP->filters(nullptr);
} }
} }