fetch only args of join

Author: Devjiu

omniscidb/QueryEngine/CardinalityEstimator.cpp

@@ -19,6 +19,19 @@
 #include "ExpressionRewrite.h"
 #include "RelAlgExecutor.h"
 
+namespace {
+
+class InputColumnsCollector
+    : public hdk::ir::ExprCollector<std::unordered_set<InputColDescriptor>,
+                                    InputColumnsCollector> {
+ protected:
+  void visitColumnVar(const hdk::ir::ColumnVar* col_var) override {
+    result_.insert(InputColDescriptor(col_var->columnInfo(), 0));
+  }
+};
+
+}  // namespace
+
 size_t RelAlgExecutor::getNDVEstimation(const WorkUnit& work_unit,
                                         const int64_t range,
                                         const bool is_agg,
@@ -101,8 +114,43 @@ RelAlgExecutionUnit create_ndv_execution_unit(const RelAlgExecutionUnit& ra_exe_
 RelAlgExecutionUnit create_count_all_execution_unit(
     const RelAlgExecutionUnit& ra_exe_unit,
     hdk::ir::ExprPtr replacement_target) {
+  InputColumnsCollector input_columns_collector;
+
+  std::list<std::shared_ptr<const InputColDescriptor>> join_input_col_descs;
+  std::stringstream os{};
+  if (!ra_exe_unit.join_quals.empty()) {
+    os << "\n[Count all] Join Quals: ";
+
+    for (size_t i = 0; i < ra_exe_unit.join_quals.size(); i++) {
+      const auto& join_condition = ra_exe_unit.join_quals[i];
+      os << "\t" << std::to_string(i) << " " << ::toString(join_condition.type);
+      for (const auto& q : join_condition.quals) {
+        input_columns_collector.visit(q.get());
+        os << q->toString() << ", ";
+      }
+    }
+  }
+  auto& input_column_descriptors = input_columns_collector.result();
+  for (auto& col_var : input_column_descriptors) {
+    LOG(INFO) << "col_vars: " << col_var;
+    for (auto& icol : ra_exe_unit.input_col_descs) {
+      if (icol->getColId() == col_var.getColId() &&
+          icol->getTableId() == col_var.getTableId()) {
+        join_input_col_descs.emplace_back(icol);
+      }
+    }
+  }
+
+  LOG(INFO) << "join quals: " << os.str();
+  std::stringstream js{};
+  js << "\n\t[Only Join] Table/Col/Levels: ";
+  for (const auto& input_col_desc : join_input_col_descs) {
+    js << "(" << input_col_desc->getTableId() << ", " << input_col_desc->getColId()
+       << ", " << input_col_desc->getNestLevel() << ") ";
+  }
+  LOG(INFO) << "join in cols: " << js.str();
   return {ra_exe_unit.input_descs,
-          ra_exe_unit.input_col_descs,
+          join_input_col_descs,
           ra_exe_unit.simple_quals,
           ra_exe_unit.quals,
           ra_exe_unit.join_quals,

omniscidb/QueryEngine/Descriptors/QueryFragmentDescriptor.cpp

@@ -151,7 +151,9 @@ void QueryFragmentDescriptor::buildFragmentPerKernelForTable(
     }
 
     ExecutionKernelDescriptor execution_kernel_desc{
-        device_id, {}, fragment.getNumTuples()};
+        .device_id = device_id,
+        .fragments = {},
+        .outer_tuple_count = fragment.getNumTuples()};
     if (table_desc_offset) {
       const auto frag_ids =
           executor->getTableFragmentIndices(ra_exe_unit,

omniscidb/QueryEngine/Execute.cpp

@@ -2497,6 +2497,7 @@ ResultSetPtr build_row_for_empty_input(
     const ExecutorDeviceType device_type) {
   std::vector<hdk::ir::ExprPtr> target_exprs_owned_copies;
   std::vector<const hdk::ir::Expr*> target_exprs;
+  LOG(INFO) << "Building row for empty input.";
   for (const auto target_expr : target_exprs_in) {
     auto agg_expr = target_expr->as<hdk::ir::AggExpr>();
     CHECK(agg_expr);

omniscidb/QueryEngine/RelAlgExecutor.cpp

@@ -1532,6 +1532,7 @@ std::optional<size_t> RelAlgExecutor::getFilteredCountAll(const WorkUnit& work_u
                                                           const bool is_agg,
                                                           const CompilationOptions& co,
                                                           const ExecutionOptions& eo) {
+  LOG(INFO) << "[getFilteredCountAll] Should add count* here.";
   const auto count = hdk::ir::makeExpr<hdk::ir::AggExpr>(
       hdk::ir::Context::defaultCtx().integer(config_.exec.group_by.bigint_count ? 8 : 4),
       hdk::ir::AggType::kCount,