aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhor911 <hor911@yandex-team.com>2025-02-25 02:40:29 +0300
committerhor911 <hor911@yandex-team.com>2025-02-25 02:57:39 +0300
commit323be453c6ab71c14d13b1fe775de412ffbca95f (patch)
treeeffd86e7e540053fb167e3ea6243cdb632790f32
parentafb5748729cbda07af01d989a854831978d1e0f8 (diff)
downloadydb-323be453c6ab71c14d13b1fe775de412ffbca95f.tar.gz
Revert commit rXXXXXX, Fix grace join tpc-ds 10 hanging
commit_hash:f0fcfeafa9f650f58890756ffd61b2b6d861d45a
-rw-r--r--yql/essentials/minikql/comp_nodes/mkql_grace_join.cpp12
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;
}