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

Fix merge and coding style issues

Browse Source
This commit is contained in:
Andrew Hutchings
2018-06-22 15:31:31 +01:00
parent 7ca289ded9
commit 8c90419852
49 changed files with 1198 additions and 925 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
dbcon/execplan/aggregatecolumn.cpp
View File

@@ -107,8 +107,8 @@ AggregateColumn::AggregateColumn(const string& functionName, const string& conte
fData(functionName + "(" + content + ")")
{
// TODO: need to handle distinct
SRCP srcp(new ArithmeticColumn(content));
fAggParms.push_back(srcp);
SRCP srcp(new ArithmeticColumn(content));
fAggParms.push_back(srcp);
}
AggregateColumn::AggregateColumn( const AggregateColumn& rhs, const uint32_t sessionID ):
@@ -144,6 +144,7 @@ const string AggregateColumn::toString() const
{
output << *(fAggParms[i]) << " ";
}
output << endl;
if (fConstCol)
@@ -167,6 +168,7 @@ void AggregateColumn::serialize(messageqcpp::ByteStream& b) const
b << static_cast<uint8_t>(fAggOp);
b << static_cast<uint32_t>(fAggParms.size());
for (uint32_t i = 0; i < fAggParms.size(); ++i)
{
fAggParms[i]->serialize(b);
@@ -208,6 +210,7 @@ void AggregateColumn::unserialize(messageqcpp::ByteStream& b)
b >> fAggOp;
b >> size;
for (i = 0; i < size; i++)
{
rc = dynamic_cast<ReturnedColumn*>(ObjectReader::createTreeNode(b));
@@ -264,9 +267,10 @@ bool AggregateColumn::operator==(const AggregateColumn& t) const
{
return false;
}
for (it = fAggParms.begin(), it2 = t.fAggParms.begin();
it != fAggParms.end();
++it, ++it2)
for (it = fAggParms.begin(), it2 = t.fAggParms.begin();
it != fAggParms.end();
++it, ++it2)
{
if (**it != **it2)
return false;