Add filter parsing to toSql methods for hasJoinNode in ReferenceQuery…

…Runners Summary: This change updates both the DuckQueryRunner and PrestoQueryRunner to parse filters in their hasJoinNode toSql methods. Differential Revision: D66021799
DanielHunte · Nov 18, 2024 · 02884d6 · 02884d6
1 parent 3eb2fa4
commit 02884d6
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 14 deletions.
diff --git a/velox/exec/fuzzer/DuckQueryRunner.cpp b/velox/exec/fuzzer/DuckQueryRunner.cpp
@@ -354,7 +354,7 @@ std::optional<std::string> DuckQueryRunner::toSql(
     return out.str();
   };
 
-  const auto& equiClausesToSql = [](auto joinNode) {
+  const auto& joinConditionAsSql = [](auto joinNode) {
     std::stringstream out;
     for (auto i = 0; i < joinNode->leftKeys().size(); ++i) {
       if (i > 0) {
@@ -363,6 +363,11 @@ std::optional<std::string> DuckQueryRunner::toSql(
       out << joinNode->leftKeys()[i]->name() << " = "
           << joinNode->rightKeys()[i]->name();
     }
+    if (joinNode->filter()) {
+      auto call = std::dynamic_pointer_cast<const core::CallTypedExpr>(
+          joinNode->filter());
+      out << " AND " << toCallSql(call);
+    }
     return out.str();
   };
 
@@ -378,13 +383,13 @@ std::optional<std::string> DuckQueryRunner::toSql(
 
   switch (joinNode->joinType()) {
     case core::JoinType::kInner:
-      sql << " FROM t INNER JOIN u ON " << equiClausesToSql(joinNode);
+      sql << " FROM t INNER JOIN u ON " << joinConditionAsSql(joinNode);
       break;
     case core::JoinType::kLeft:
-      sql << " FROM t LEFT JOIN u ON " << equiClausesToSql(joinNode);
+      sql << " FROM t LEFT JOIN u ON " << joinConditionAsSql(joinNode);
       break;
     case core::JoinType::kFull:
-      sql << " FROM t FULL OUTER JOIN u ON " << equiClausesToSql(joinNode);
+      sql << " FROM t FULL OUTER JOIN u ON " << joinConditionAsSql(joinNode);
       break;
     case core::JoinType::kLeftSemiFilter:
       if (joinNode->leftKeys().size() > 1) {
@@ -399,8 +404,8 @@ std::optional<std::string> DuckQueryRunner::toSql(
         sql << ", " << joinKeysToSql(joinNode->leftKeys()) << " IN (SELECT "
             << joinKeysToSql(joinNode->rightKeys()) << " FROM u) FROM t";
       } else {
-        sql << ", EXISTS (SELECT * FROM u WHERE " << equiClausesToSql(joinNode)
-            << ") FROM t";
+        sql << ", EXISTS (SELECT * FROM u WHERE "
+            << joinConditionAsSql(joinNode) << ") FROM t";
       }
       break;
     case core::JoinType::kAnti:
@@ -410,7 +415,7 @@ std::optional<std::string> DuckQueryRunner::toSql(
             << " FROM u)";
       } else {
         sql << " FROM t WHERE NOT EXISTS (SELECT * FROM u WHERE "
-            << equiClausesToSql(joinNode) << ")";
+            << joinConditionAsSql(joinNode) << ")";
       }
       break;
     default:

diff --git a/velox/exec/fuzzer/PrestoQueryRunner.cpp b/velox/exec/fuzzer/PrestoQueryRunner.cpp
@@ -569,7 +569,7 @@ std::optional<std::string> PrestoQueryRunner::toSql(
     return out.str();
   };
 
-  const auto equiClausesToSql = [](auto joinNode) {
+  const auto& joinConditionAsSql = [](auto joinNode) {
     std::stringstream out;
     for (auto i = 0; i < joinNode->leftKeys().size(); ++i) {
       if (i > 0) {
@@ -578,6 +578,11 @@ std::optional<std::string> PrestoQueryRunner::toSql(
       out << joinNode->leftKeys()[i]->name() << " = "
           << joinNode->rightKeys()[i]->name();
     }
+    if (joinNode->filter()) {
+      auto call = std::dynamic_pointer_cast<const core::CallTypedExpr>(
+          joinNode->filter());
+      out << " AND " << toCallSql(call);
+    }
     return out.str();
   };
 
@@ -593,13 +598,13 @@ std::optional<std::string> PrestoQueryRunner::toSql(
 
   switch (joinNode->joinType()) {
     case core::JoinType::kInner:
-      sql << " FROM t INNER JOIN u ON " << equiClausesToSql(joinNode);
+      sql << " FROM t INNER JOIN u ON " << joinConditionAsSql(joinNode);
       break;
     case core::JoinType::kLeft:
-      sql << " FROM t LEFT JOIN u ON " << equiClausesToSql(joinNode);
+      sql << " FROM t LEFT JOIN u ON " << joinConditionAsSql(joinNode);
       break;
     case core::JoinType::kFull:
-      sql << " FROM t FULL OUTER JOIN u ON " << equiClausesToSql(joinNode);
+      sql << " FROM t FULL OUTER JOIN u ON " << joinConditionAsSql(joinNode);
       break;
     case core::JoinType::kLeftSemiFilter:
       if (joinNode->leftKeys().size() > 1) {
@@ -614,8 +619,8 @@ std::optional<std::string> PrestoQueryRunner::toSql(
         sql << ", " << joinKeysToSql(joinNode->leftKeys()) << " IN (SELECT "
             << joinKeysToSql(joinNode->rightKeys()) << " FROM u) FROM t";
       } else {
-        sql << ", EXISTS (SELECT * FROM u WHERE " << equiClausesToSql(joinNode)
-            << ") FROM t";
+        sql << ", EXISTS (SELECT * FROM u WHERE "
+            << joinConditionAsSql(joinNode) << ") FROM t";
       }
       break;
     case core::JoinType::kAnti:
@@ -625,7 +630,7 @@ std::optional<std::string> PrestoQueryRunner::toSql(
             << " FROM u)";
       } else {
         sql << " FROM t WHERE NOT EXISTS (SELECT * FROM u WHERE "
-            << equiClausesToSql(joinNode) << ")";
+            << joinConditionAsSql(joinNode) << ")";
       }
       break;
     default: