Get rid of specialized classes for processing json_arrgayagg

Use a boolean flag and a couple of `if`s

Author: mariadb-AlexeyAntipovsky

dbcon/execplan/CMakeLists.txt

@@ -22,7 +22,6 @@ set(execplan_LIB_SRCS
     functioncolumn.cpp
     groupconcatcolumn.cpp
     intervalcolumn.cpp
-    jsonarrayaggcolumn.cpp
     logicoperator.cpp
     mysqlexecutionplan.cpp
     objectidmanager.cpp

dbcon/execplan/groupconcatcolumn.cpp

@@ -41,22 +41,19 @@ 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)
 {
 }
 
 GroupConcatColumn::GroupConcatColumn(const GroupConcatColumn& rhs, const uint32_t sessionID)
  : AggregateColumn(dynamic_cast<const AggregateColumn&>(rhs))
  , fOrderCols(rhs.fOrderCols)
  , fSeparator(rhs.fSeparator)
-{
-}
-
-GroupConcatColumn::~GroupConcatColumn()
+ , fIsJsonArrayAgg(rhs.fIsJsonArrayAgg)
 {
 }
 
@@ -67,24 +64,32 @@ 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();
 }
 
 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 +105,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 +132,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 +164,9 @@ bool GroupConcatColumn::operator==(const GroupConcatColumn& t) const
   if (fSeparator != t.fSeparator)
     return false;
 
+  if (fIsJsonArrayAgg != t.fIsJsonArrayAgg)
+    return false;
+
   return true;
 }
 

dbcon/execplan/groupconcatcolumn.h

@@ -50,27 +50,27 @@ class GroupConcatColumn : public AggregateColumn
   /**
    * Constructors
    */
-  GroupConcatColumn();
+  explicit GroupConcatColumn(bool isJsonArrayAgg = false);
 
-  GroupConcatColumn(const uint32_t sessionID);
+  explicit GroupConcatColumn(const uint32_t sessionID, bool isJsonArrayAgg = false);
 
   GroupConcatColumn(const GroupConcatColumn& rhs, const uint32_t sessionID = 0);
 
   /**
    * Destructors
    */
-  virtual ~GroupConcatColumn();
+  ~GroupConcatColumn() override = default;
 
   /**
    * Overloaded stream operator
    */
-  virtual const std::string toString() const override;
+  const std::string toString() const override;
 
   /** return a copy of this pointer
    *
    * deep copy of this pointer and return the copy
    */
-  virtual GroupConcatColumn* clone() const override
+  GroupConcatColumn* clone() const override
   {
     return new GroupConcatColumn(*this);
   }
@@ -98,8 +98,8 @@ class GroupConcatColumn : public AggregateColumn
   /**
    * Serialize interface
    */
-  virtual void serialize(messageqcpp::ByteStream&) const override;
-  virtual void unserialize(messageqcpp::ByteStream&) override;
+  void serialize(messageqcpp::ByteStream&) const override;
+  void unserialize(messageqcpp::ByteStream&) override;
 
   /** @brief Do a deep, strict (as opposed to semantic) equivalence test
    *
@@ -140,6 +140,7 @@ class GroupConcatColumn : public AggregateColumn
  private:
   std::vector<SRCP> fOrderCols;
   std::string fSeparator;
+  bool fIsJsonArrayAgg{false};
 };
 
 /**