Revert commit rXXXXXX, Fix grace join tpc-ds 10 hanging

commit_hash:f0fcfeafa9f650f58890756ffd61b2b6d861d45a

1 files changed, 4 insertions, 8 deletions

diff --git a/yql/essentials/minikql/comp_nodes/mkql_grace_join.cpp b/yql/essentials/minikql/comp_nodes/mkql_grace_join.cpp
index 9af653b902..0a511e61ad 100644
--- a/yql/essentials/minikql/comp_nodes/mkql_grace_join.cpp
+++ b/yql/essentials/minikql/comp_nodes/mkql_grace_join.cpp
@@ -755,6 +755,10 @@ private:
             }
         }
 
+        if (resultLeft == EFetchResult::Yield || resultRight == EFetchResult::Yield) {
+            return EFetchResult::Yield;
+        }
+
         if (resultLeft == EFetchResult::Finish ) {
             *HaveMoreLeftRows = false;
         }
@@ -764,14 +768,6 @@ private:
             *HaveMoreRightRows = false;
         }
 
-        if (!*HaveMoreLeftRows && !*HaveMoreRightRows) {
-            return EFetchResult::Finish;
-        }
-
-        if ((resultLeft == EFetchResult::Yield || !*HaveMoreLeftRows) && (resultRight == EFetchResult::Yield || !*HaveMoreRightRows)) {
-            return EFetchResult::Yield;
-        }
-
         return EFetchResult::Finish;
     }