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): satisfy gcc9 for execplan partionions unequivalence

Browse Source
This commit is contained in:
Leonid Fedorov
2025-04-25 11:24:19 +00:00
committed by Leonid Fedorov
parent bd1622f331
commit 8859e3f4df
3 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dbcon/execplan/calpontsystemcatalog.cpp
View File

@@ -6370,5 +6370,10 @@ bool operator ==(const Partitions& a, const Partitions& b)
return true; return true;
} }
bool operator !=(const Partitions& a, const Partitions& b)
{
return !(a == b);
}
} // namespace execplan } // namespace execplan
// vim:sw=4 ts=4: // vim:sw=4 ts=4:

1
dbcon/execplan/calpontsystemcatalog.h
View File

@@ -101,6 +101,7 @@ struct Partitions {
}; };
bool operator <(const Partitions& a, const Partitions& b); bool operator <(const Partitions& a, const Partitions& b);
bool operator ==(const Partitions& a, const Partitions& b); bool operator ==(const Partitions& a, const Partitions& b);
bool operator !=(const Partitions& a, const Partitions& b); // for GCC9
/** The CalpontSystemCatalog class /** The CalpontSystemCatalog class
* *

22
dbcon/execplan/simplecolumn.cpp
View File

@@ -210,9 +210,7 @@ SimpleColumn::SimpleColumn(const SimpleColumn& rhs, const uint32_t sessionID)
} }
SimpleColumn::SimpleColumn(const ReturnedColumn& rhs, const uint32_t sessionID) SimpleColumn::SimpleColumn(const ReturnedColumn& rhs, const uint32_t sessionID)
: ReturnedColumn(rhs, sessionID) : ReturnedColumn(rhs, sessionID), fData(rhs.data()), fisColumnStore(true)
, fData(rhs.data())
, fisColumnStore(true)
{ {
} }
@@ -270,7 +268,7 @@ const string SimpleColumn::toString() const
ostringstream output; ostringstream output;
ostringstream ossps; ostringstream ossps;
for (uint32_t i=0;i<fPartitions.fPartNames.size();i++) for (uint32_t i = 0; i < fPartitions.fPartNames.size(); i++)
{ {
if (i > 0) if (i > 0)
{ {
@@ -283,15 +281,13 @@ const string SimpleColumn::toString() const
// set in the plugin code. // set in the plugin code.
datatypes::Charset cs(fResultType.charsetNumber); datatypes::Charset cs(fResultType.charsetNumber);
output << " s/t/ps/c/v/o/ct/TA/CA/RA/#/card/join/source/engine/colPos/cs/coll: " << schemaName() << delim output << " s/t/ps/c/v/o/ct/TA/CA/RA/#/card/join/source/engine/colPos/cs/coll: " << schemaName() << delim
<< tableName() << delim << ossps.str() << delim << columnName() << delim << tableName() << delim << ossps.str() << delim << columnName() << delim << viewName() << delim
<< viewName() << delim << oid() << delim << oid() << delim << colDataTypeToString(fResultType.colDataType) << delim << tableAlias() << delim
<< colDataTypeToString(fResultType.colDataType) << delim << tableAlias() << delim << alias() << delim << alias() << delim << returnAll() << delim << sequence() << delim << cardinality() << delim
<< returnAll() << delim << sequence() << delim << cardinality() << delim << joinInfo() << delim << joinInfo() << delim << colSource() << delim << (isColumnStore() ? "ColumnStore" : "ForeignEngine")
<< colSource() << delim << (isColumnStore() ? "ColumnStore" : "ForeignEngine") << delim << delim << colPosition() << delim << cs.getCharset().cs_name.str << delim
<< colPosition() << delim << cs.getCharset().cs_name.str << delim << cs.getCharset().coll_name.str << cs.getCharset().coll_name.str << " inputindex/outputindex: " << fInputIndex << delim
<< " inputindex/outputindex: " << fInputIndex << delim << fOutputIndex << fOutputIndex << " eid " << fExpressionId << endl;
<< " eid " << fExpressionId
<< endl;
return output.str(); return output.str();
} }