feat(joblist): descend into SelectFilter even if it contains correlated sub.

dbcon/execplan/selectfilter.cpp

@@ -26,6 +26,7 @@
 using namespace std;
 
 #include "selectfilter.h"
+#include "simplecolumn.h"
 #include "bytestream.h"
 #include "objectreader.h"
 
@@ -62,7 +63,8 @@ const string SelectFilter::toString() const
 {
   ostringstream oss;
   oss << "SelectFilter "
-      << "returnedColPos=" << fReturnedColPos << endl;
+      << "returnedColPos=" << fReturnedColPos 
+      << " correlated " << fCorrelated << endl;
 
   for (uint32_t i = 0; i < fCols.size(); i++)
     oss << fCols[i]->toString();
@@ -214,4 +216,32 @@ bool SelectFilter::operator!=(const TreeNode* t) const
   return (!(*this == t));
 }
 
+
+void SelectFilter::setSimpleColumnListExtended()
+{
+  fSimpleColumnListExtended.clear();
+  for (auto col : fCols)
+  {
+    col->setSimpleColumnListExtended();
+    fSimpleColumnListExtended.insert(fSimpleColumnListExtended.end(),
+                                     col->simpleColumnListExtended().begin(),
+                                     col->simpleColumnListExtended().end());
+  }
+  if (fCorrelated)
+  {
+    auto* subFilters = fSub->filters();
+    if (subFilters)
+    {
+      std::vector<execplan::SimpleColumn*> simpleColumns;
+      subFilters->walk(execplan::getSimpleColsExtended, &simpleColumns);
+      fSimpleColumnListExtended.insert(fSimpleColumnListExtended.end(),
+                                       simpleColumns.begin(),
+                                       simpleColumns.end());
+    }
+  }
+}
+
+const std::vector<SimpleColumn*>& SelectFilter::simpleColumnListExtended()
+{ return fSimpleColumnListExtended; }
+
 }  // namespace execplan

dbcon/execplan/selectfilter.h

@@ -170,6 +170,9 @@ class SelectFilter : public Filter
    */
   bool operator!=(const SelectFilter& t) const;
 
+  void setSimpleColumnListExtended();
+  const std::vector<SimpleColumn*>& simpleColumnListExtended();
+
  private:
   // default okay?
   // SelectFilter& operator=(const SelectFilter& rhs);
@@ -180,6 +183,7 @@ class SelectFilter : public Filter
   bool fCorrelated;
   std::string fData;
   uint64_t fReturnedColPos;  // offset in fSub->returnedColList to indicate the start of projection
+  std::vector<SimpleColumn*> fSimpleColumnListExtended{};
 };
 
 std::ostream& operator<<(std::ostream& output, const SelectFilter& rhs);

dbcon/execplan/simplecolumn.cpp

@@ -48,6 +48,7 @@ using namespace joblist;
 #include "functioncolumn.h"
 #include "simplecolumn.h"
 #include "simplefilter.h"
+#include "selectfilter.h"
 #include "aggregatecolumn.h"
 #include "constantfilter.h"
 #include "../../utils/windowfunction/windowfunction.h"
@@ -95,12 +96,13 @@ void getSimpleColsExtended(execplan::ParseTree* n, void* obj)
 {
   vector<SimpleColumn*>* list = reinterpret_cast<vector<SimpleColumn*>*>(obj);
   TreeNode* tn = n->data();
-  SimpleColumn* sc = dynamic_cast<SimpleColumn*>(tn);
-  FunctionColumn* fc = dynamic_cast<FunctionColumn*>(tn);
   ArithmeticColumn* ac = dynamic_cast<ArithmeticColumn*>(tn);
-  SimpleFilter* sf = dynamic_cast<SimpleFilter*>(tn);
-  ConstantFilter* cf = dynamic_cast<ConstantFilter*>(tn);
   AggregateColumn* agc = dynamic_cast<AggregateColumn*>(tn);
+  ConstantFilter* cf = dynamic_cast<ConstantFilter*>(tn);
+  FunctionColumn* fc = dynamic_cast<FunctionColumn*>(tn);
+  SimpleColumn* sc = dynamic_cast<SimpleColumn*>(tn);
+  SelectFilter* selectFilter = dynamic_cast<SelectFilter*>(tn);
+  SimpleFilter* sf = dynamic_cast<SimpleFilter*>(tn);
 
   if (sc)
   {
@@ -126,6 +128,11 @@ void getSimpleColsExtended(execplan::ParseTree* n, void* obj)
     sf->setSimpleColumnListExtended();
     list->insert(list->end(), sf->simpleColumnListExtended().begin(), sf->simpleColumnListExtended().end());
   }
+  else if (selectFilter)
+  {
+    selectFilter->setSimpleColumnListExtended();
+    list->insert(list->end(), selectFilter->simpleColumnListExtended().begin(), selectFilter->simpleColumnListExtended().end());
+  }
   else if (cf)
   {
     cf->setSimpleColumnListExtended();