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(build): fixes to satisfy clang19 warnings

Browse Source
This commit is contained in:
Leonid Fedorov
2025-05-08 15:26:36 +00:00
committed by Leonid Fedorov
parent 9fd7f342a7
commit a0bee173f6
334 changed files with 3062 additions and 3323 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
dbcon/joblist/jlf_common.cpp
View File

@@ -44,9 +44,8 @@ namespace
// @brief Returns unique key for a column, table, or expresssion.
uint32_t uniqTupleKey(JobInfo& jobInfo, CalpontSystemCatalog::OID& o, CalpontSystemCatalog::OID& t,
const string& cn, const string& ca, const string& tn, const string& ta,
const string& sn, const string& vw, const execplan::Partitions& pa,
uint32_t pi, uint64_t en,
bool correlated = false)
const string& sn, const string& vw, const execplan::Partitions& pa, uint32_t pi,
uint64_t en, bool correlated = false)
{
uint64_t subId = jobInfo.subId;
@@ -159,13 +158,12 @@ TupleInfo setTupleInfo_(const CalpontSystemCatalog::ColType& ct, CalpontSystemCa
JobInfo& jobInfo, CalpontSystemCatalog::OID tbl_oid, const string& col_name,
const string& col_alias, const string& sch_name, const string& tbl_name,
const string& tbl_alias, const string& vw_name,
const execplan::Partitions& partitions,
bool correlated = false,
uint32_t pc_id = 0, uint64_t engine = 0)
const execplan::Partitions& partitions, bool correlated = false, uint32_t pc_id = 0,
uint64_t engine = 0)
{
// get the unique tupleOids for this column
uint32_t tbl_key = uniqTupleKey(jobInfo, tbl_oid, tbl_oid, "", "", tbl_name, tbl_alias, sch_name, vw_name, partitions,
0, engine, correlated);
uint32_t tbl_key = uniqTupleKey(jobInfo, tbl_oid, tbl_oid, "", "", tbl_name, tbl_alias, sch_name, vw_name,
partitions, 0, engine, correlated);
uint32_t col_key = uniqTupleKey(jobInfo, col_oid, tbl_oid, col_name, col_alias, tbl_name, tbl_alias,
sch_name, vw_name, partitions, pc_id, engine, correlated);
// If this is the first time we've seen this col, add it to the tim
@@ -197,8 +195,8 @@ TupleInfo setTupleInfo_(const CalpontSystemCatalog::ColType& ct, CalpontSystemCa
uint32_t getTupleKey_(const JobInfo& jobInfo, CalpontSystemCatalog::OID oid, const string& colName,
const string& tblAlias, const string& schema, const string& view,
const execplan::Partitions& part,
bool correlated = false, uint32_t pseudo = 0, uint64_t engine = 0)
const execplan::Partitions& part, bool correlated = false, uint32_t pseudo = 0,
uint64_t /*engine*/ = 0)
{
uint64_t subId = jobInfo.subId;
@@ -289,9 +287,7 @@ string UniqId::toString() const
strstm << dlm << p;
dlm = ",";
}
strstm << "):"
<< fPseudo << ":"
<< (int64_t)fSubId;
strstm << "):" << fPseudo << ":" << (int64_t)fSubId;
return strstm.str();
}
@@ -410,7 +406,7 @@ uint32_t getTupleKey(JobInfo& jobInfo, const execplan::SimpleColumn* sc, bool ad
// TupleInfo is expected to be set already
return getTupleKey_(jobInfo, sc->oid(), sc->columnName(), extractTableAlias(sc), sc->schemaName(),
sc->viewName(), execplan::Partitions(),
((sc->joinInfo() & execplan::JOIN_CORRELATED) != 0), pseudoType,
((sc->joinInfo() & execplan::JOIN_CORRELATED) != 0), pseudoType,
(sc->isColumnStore() ? 0 : 1));
}
@@ -492,7 +488,7 @@ uint32_t getTupleKey(JobInfo& jobInfo, const SRCP& srcp, bool add)
uint32_t getTableKey(const JobInfo& jobInfo, execplan::CalpontSystemCatalog::OID tableOid,
const string& alias, const string& schema, const string& view,
const execplan::Partitions& part)
const execplan::Partitions& part)
{
return getTupleKey_(jobInfo, tableOid, "", alias, schema, view, part);
}
@@ -582,7 +578,8 @@ TupleInfo setExpTupleInfo(const execplan::CalpontSystemCatalog::ColType& ct, uin
if (!(ji->subAlias.empty()))
expAlias += ji->subAlias;
return setTupleInfo_(ct, expressionId, jobInfo, CNX_EXP_TABLE_ID, "", alias, "", "$exp", expAlias, "", execplan::Partitions(), cr);
return setTupleInfo_(ct, expressionId, jobInfo, CNX_EXP_TABLE_ID, "", alias, "", "$exp", expAlias, "",
execplan::Partitions(), cr);
}
TupleInfo setExpTupleInfo(const execplan::ReturnedColumn* rc, JobInfo& jobInfo)