simplify non-determenistic wrapping

Author: MBkkt

axiom/optimizer/ToGraph.cpp

@@ -1767,17 +1767,16 @@ DerivedTableP ToGraph::makeQueryGraph(
       return nullptr;
     }
     case lp::NodeKind::kFilter: {
+      const auto& input = *node.onlyInput();
       const auto& filter = *node.asUnchecked<lp::FilterNode>();
-      if (!isNondeterministicWrap_ && hasNondeterministic(filter.predicate())) {
-        auto* outerDt = makeStream(*node.onlyInput(), allowedInDt);
+      if (hasNondeterministic(filter.predicate())) {
+        auto* outerDt = makeStream(input, 0);
         addFilter(filter);
         finalizeDt(node, outerDt);
-        isNondeterministicWrap_ = true;
         return nullptr;
       }
-      isNondeterministicWrap_ = false;
-      auto* outerDt = makeStream(*node.onlyInput(), allowedInDt);
-      addFilter(*node.asUnchecked<lp::FilterNode>());
+      auto* outerDt = makeStream(input, allowedInDt);
+      addFilter(filter);
       return outerDt;
     }
     case lp::NodeKind::kProject: {
@@ -1805,11 +1804,7 @@ DerivedTableP ToGraph::makeQueryGraph(
       if (auto* outerDt = makeUnordered(*join.left(), allowedInDt)) {
         finalizeDt(*join.left(), outerDt);
       }
-      if (isNondeterministicWrap_) {
-        allowedInDt = 0;
-        isNondeterministicWrap_ = false;
-      } else if (
-          join.joinType() != lp::JoinType::kInner ||
+      if (join.joinType() != lp::JoinType::kInner ||
           queryCtx()->optimization()->options().syntacticJoinOrder) {
         allowedInDt = makeDtIf(allowedInDt, lp::NodeKind::kJoin);
       }

axiom/optimizer/ToGraph.h

@@ -433,9 +433,6 @@ class ToGraph {
   // Innermost DerivedTable when making a QueryGraph from PlanNode.
   DerivedTableP currentDt_{nullptr};
 
-  // True if wrapping a nondeterministic filter inside a DT in ToGraph.
-  bool isNondeterministicWrap_{false};
-
   // Source PlanNode when inside addProjection() or 'addFilter().
   const logical_plan::LogicalPlanNode* exprSource_{nullptr};