database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-01 06:46:55 +03:00
Code Activity

feat(PrimProc): MCOL-5852 disk-based GROUP_CONCAT & JSON_ARRAYAGG

Browse Source 
* move GROUP_CONCAT/JSON_ARRAYAGG storage to the RowGroup from
  the RowAggregation*
* internal data structures (de)serialization
* get rid of a specialized classes for processing JSON_ARRAYAGG
* move the memory accounting to disk-based aggregation classes
* allow aggregation generations to be used for queries with
  GROUP_CONCAT/JSON_ARRAYAGG
* Remove the thread id from the error message as it interferes with the mtr
This commit is contained in:
Aleksei Antipovskii
2025-02-19 12:32:51 +01:00
committed by Alexey Antipovsky
parent 87d47fd7ae
commit 4bea7e59a0
25 changed files with 1339 additions and 2056 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
dbcon/execplan/groupconcatcolumn.cpp
View File

@ -41,11 +41,12 @@ namespace execplan
/**
* Constructors/Destructors
*/
GroupConcatColumn::GroupConcatColumn() : AggregateColumn()
GroupConcatColumn::GroupConcatColumn(bool isJsonArrayAgg) : AggregateColumn(), fIsJsonArrayAgg(isJsonArrayAgg)
{
}
GroupConcatColumn::GroupConcatColumn(const uint32_t sessionID) : AggregateColumn(sessionID)
GroupConcatColumn::GroupConcatColumn(const uint32_t sessionID, bool isJsonArrayAgg)
: AggregateColumn(sessionID), fIsJsonArrayAgg(isJsonArrayAgg)
{
}
@ -53,10 +54,7 @@ GroupConcatColumn::GroupConcatColumn(const GroupConcatColumn& rhs, const uint32_
: AggregateColumn(dynamic_cast<const AggregateColumn&>(rhs))
, fOrderCols(rhs.fOrderCols)
, fSeparator(rhs.fSeparator)
{
}
GroupConcatColumn::~GroupConcatColumn()
, fIsJsonArrayAgg(rhs.fIsJsonArrayAgg)
{
}
@ -67,16 +65,26 @@ GroupConcatColumn::~GroupConcatColumn()
const string GroupConcatColumn::toString() const
{
ostringstream output;
output << "GroupConcatColumn " << data() << endl;
output << AggregateColumn::toString() << endl;
output << "Group Concat Order Columns: " << endl;
if (fIsJsonArrayAgg)
{
output << "JsonArrayAggColumn " << data() << endl;
output << AggregateColumn::toString() << endl;
output << "Json Array Order Columns: " << endl;
}
else
{
output << "GroupConcatColumn " << data() << endl;
output << AggregateColumn::toString() << endl;
output << "Group Concat Order Columns: " << endl;
}
for (uint32_t i = 0; i < fOrderCols.size(); i++)
{
output << *fOrderCols[i];
}
output << "\nSeparator: " << fSeparator << endl;
if (!fIsJsonArrayAgg)
output << "\nSeparator: " << fSeparator << endl;
return output.str();
}
@ -84,7 +92,7 @@ string GroupConcatColumn::toCppCode(IncludeSet& includes) const
{
includes.insert("groupconcatcolumn.h");
stringstream ss;
ss << "GroupConcatColumn(" << sessionID() << ")";
ss << "GroupConcatColumn(" << sessionID() << "," << std::boolalpha << fIsJsonArrayAgg << ")";
return ss.str();
}
@ -100,13 +108,13 @@ void GroupConcatColumn::serialize(messageqcpp::ByteStream& b) const
b << (uint8_t)ObjectReader::GROUPCONCATCOLUMN;
AggregateColumn::serialize(b);
CalpontSelectExecutionPlan::ReturnedColumnList::const_iterator rcit;
b << static_cast<uint32_t>(fOrderCols.size());
for (rcit = fOrderCols.begin(); rcit != fOrderCols.end(); ++rcit)
(*rcit)->serialize(b);
for (const auto& col : fOrderCols)
col->serialize(b);
b << fSeparator;
b << (uint8_t)fIsJsonArrayAgg;
}
void GroupConcatColumn::unserialize(messageqcpp::ByteStream& b)
@ -127,6 +135,9 @@ void GroupConcatColumn::unserialize(messageqcpp::ByteStream& b)
}
b >> fSeparator;
uint8_t tmp8;
b >> tmp8;
fIsJsonArrayAgg = tmp8;
}
bool GroupConcatColumn::operator==(const GroupConcatColumn& t) const
@ -156,6 +167,9 @@ bool GroupConcatColumn::operator==(const GroupConcatColumn& t) const
if (fSeparator != t.fSeparator)
return false;
if (fIsJsonArrayAgg != t.fIsJsonArrayAgg)
return false;
return true;
}