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

chore(QA): fixed compilation and preprocessor filtering macro.

Browse Source
This commit is contained in:
drrtuy
2025-08-06 12:41:51 +00:00
parent 877bd85d6a
commit 7ad42678d4
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dbcon/mysql/ha_mcs_execplan.cpp
View File

@@ -5205,9 +5205,10 @@ void setExecutionParams(gp_walk_info& gwi, SCSEP& csep)
} }
// Loop over indexes available for a table to find and extract corresponding Engine Independent column // Loop over indexes available for a table to find and extract corresponding Engine Independent column
// statistics for the first column of the index if any. Statistics are stored in a GWI context. Mock for ES 10.6 // statistics for the first column of the index if any. Statistics are stored in a GWI context. Mock for
// ES 10.6
// TODO clean up extra logging when the feature is ready // TODO clean up extra logging when the feature is ready
#if MYSQL_VERSION_ID >= 110401 #if MYSQL_VERSION_ID >= 110406
void extractColumnStatistics(TABLE_LIST* table_ptr, gp_walk_info& gwi) void extractColumnStatistics(TABLE_LIST* table_ptr, gp_walk_info& gwi)
{ {
for (uint j = 0; j < table_ptr->table->s->keys; j++) for (uint j = 0; j < table_ptr->table->s->keys; j++)
@@ -5223,7 +5224,8 @@ void extractColumnStatistics(TABLE_LIST* table_ptr, gp_walk_info& gwi)
{ {
std::cout << " has stats with " << histogram->buckets.size() << " buckets"; std::cout << " has stats with " << histogram->buckets.size() << " buckets";
SchemaAndTableName tableName = {field->table->s->db.str, field->table->s->table_name.str}; SchemaAndTableName tableName = {field->table->s->db.str, field->table->s->table_name.str};
auto* sc = buildSimpleColumnFromFieldForStatistics(field, gwi); auto sc =
std::unique_ptr<execplan::SimpleColumn>(buildSimpleColumnFromFieldForStatistics(field, gwi));
std::cout << "sc with stats !!!!! " << sc->toString() << std::endl; std::cout << "sc with stats !!!!! " << sc->toString() << std::endl;
auto tableStatisticsMapIt = gwi.tableStatisticsMap.find(tableName); auto tableStatisticsMapIt = gwi.tableStatisticsMap.find(tableName);

2
dbcon/mysql/idb_mysql.h
View File

@@ -67,7 +67,7 @@
#include "rpl_rli.h" #include "rpl_rli.h"
#include "my_dbug.h" #include "my_dbug.h"
#include "sql_show.h" #include "sql_show.h"
#if MYSQL_VERSION_ID >= 120401 #if MYSQL_VERSION_ID >= 110406
#include "opt_histogram_json.h" #include "opt_histogram_json.h"
#else #else
// Mock Histogram_bucket for MySQL < 11.4 // Mock Histogram_bucket for MySQL < 11.4