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

chore(rbo,rules): fixes to compile MCS with ES 10.6

Browse Source
This commit is contained in:
drrtuy
2025-07-18 16:32:08 +00:00
parent a01c883e07
commit f881bae496
5 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dbcon/mysql/ha_mcs_execplan.cpp
View File

@@ -6316,7 +6316,7 @@ void extractColumnStatistics(Item_field* ifp, gp_walk_info& gwi)
} }
} }
#else #else
void extractColumnStatistics(Item_field* ifp, gp_walk_info& gwi) void extractColumnStatistics(Item_field* /*ifp*/, gp_walk_info& /*gwi*/)
{ {
} }
#endif #endif

1
dbcon/mysql/ha_mcs_impl_if.h
View File

@@ -28,7 +28,6 @@
#include <vector> #include <vector>
#include "basic/string_utils.h" #include "basic/string_utils.h"
#include "idb_mysql.h" #include "idb_mysql.h"
#include "sql_statistics.h"
#include "ha_mcs_sysvars.h" #include "ha_mcs_sysvars.h"
#include "dmlpkg.h" #include "dmlpkg.h"

2
dbcon/mysql/ha_select_sub.cpp
View File

@@ -98,8 +98,6 @@ SCSEP SelectSubQuery::transform()
// Insert column statistics // Insert column statistics
fGwip.mergeTableStatistics(gwi.tableStatisticsMap); fGwip.mergeTableStatistics(gwi.tableStatisticsMap);
// std::cout << "fGwip.columnStatisticsMap 2 size " << fGwip.columnStatisticsMap.size() << std::endl;
// std::cout << "gwi.columnStatisticsMap 2 size " << gwi.columnStatisticsMap.size() << std::endl;
// Insert subselect CSEP // Insert subselect CSEP
fGwip.subselectList.push_back(csep); fGwip.subselectList.push_back(csep);

2
dbcon/mysql/idb_mysql.h
View File

@@ -87,7 +87,7 @@ struct Histogram_bucket
longlong ndv; longlong ndv;
}; };
class Histogram_json_hb final : public Histogram_base class Histogram_json_hb
{ {
std::vector<Histogram_bucket> buckets; std::vector<Histogram_bucket> buckets;

5
dbcon/mysql/rbo_apply_parallel_ces.cpp
View File

@@ -58,7 +58,7 @@ bool matchParallelCES(execplan::CalpontSelectExecutionPlan& csep)
{ {
auto tables = csep.tableList(); auto tables = csep.tableList();
// This is leaf and there are no other tables at this level in neither UNION, nor derived table. // This is leaf and there are no other tables at this level in neither UNION, nor derived table.
// WIP filter out CSEPs with orderBy, groupBy, having // TODO filter out CSEPs with orderBy, groupBy, having
// Filter out tables that were re-written. // Filter out tables that were re-written.
return tables.size() == 1 && !tables[0].isColumnstore() && !tableIsInUnion(tables[0], csep); return tables.size() == 1 && !tables[0].isColumnstore() && !tableIsInUnion(tables[0], csep);
} }
@@ -76,13 +76,12 @@ execplan::ParseTree* filtersWithNewRangeAddedIfNeeded(execplan::SCSEP& csep, exe
auto* filterColLeftOp = new execplan::ConstantColumnUInt(bound.second, 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
// WIP here we lost upper bound value if predicate is not changed to weak lt // TODO here we lost upper bound value if predicate is not changed to weak lt
execplan::SOP ltOp = boost::make_shared<execplan::Operator>(execplan::PredicateOperator("<")); 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());
auto* sfr = new execplan::SimpleFilter(ltOp, tableKeyColumnLeftOp, filterColLeftOp); auto* sfr = new execplan::SimpleFilter(ltOp, tableKeyColumnLeftOp, filterColLeftOp);
// auto tableKeyColumn = derivedSCEP->returnedCols().front();
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