YQL-15832 Hotfix make common sorted constraint over all empty inputs.

1 files changed, 21 insertions, 23 deletions

diff --git a/ydb/library/yql/ast/yql_constraint.cpp b/ydb/library/yql/ast/yql_constraint.cpp
index 4ffe62e4b6b..ac248dd7c02 100644
--- a/ydb/library/yql/ast/yql_constraint.cpp
+++ b/ydb/library/yql/ast/yql_constraint.cpp
@@ -340,33 +340,31 @@ const TSortedConstraintNode* TSortedConstraintNode::MakeCommon(const std::vector
 
     std::optional<TContainerType> content;
     for (size_t i = 0U; i < constraints.size(); ++i) {
-        if (!constraints[i]->GetConstraint<TEmptyConstraintNode>()) {
-            if (const auto sort = constraints[i]->GetConstraint<TSortedConstraintNode>()) {
-                const auto& nextContent = sort->GetContent();
-                if (content) {
-                    const auto size = std::min(content->size(), nextContent.size());
-                    content->resize(size);
-                    for (auto j = 0U; j < size; ++j) {
-                        auto& one = (*content)[j];
-                        auto& two = nextContent[j];
-                        TSetType common;
-                        common.reserve(std::min(one.first.size(), two.first.size()));
-                        std::set_intersection(one.first.cbegin(), one.first.cend(), two.first.cbegin(), two.first.cend(), std::back_inserter(common));
-                        if (common.empty() || one.second != two.second) {
-                            content->resize(j);
-                            break;
-                        } else
-                            one.first = std::move(common);
-                    }
-                    if (content->empty())
+        if (const auto sort = constraints[i]->GetConstraint<TSortedConstraintNode>()) {
+            const auto& nextContent = sort->GetContent();
+            if (content) {
+                const auto size = std::min(content->size(), nextContent.size());
+                content->resize(size);
+                for (auto j = 0U; j < size; ++j) {
+                    auto& one = (*content)[j];
+                    auto& two = nextContent[j];
+                    TSetType common;
+                    common.reserve(std::min(one.first.size(), two.first.size()));
+                    std::set_intersection(one.first.cbegin(), one.first.cend(), two.first.cbegin(), two.first.cend(), std::back_inserter(common));
+                    if (common.empty() || one.second != two.second) {
+                        content->resize(j);
                         break;
-                } else {
-                    content = nextContent;
+                    } else
+                        one.first = std::move(common);
                 }
+                if (content->empty())
+                    break;
             } else {
-                content.reset();
-                break;
+                content = nextContent;
             }
+        } else if (!constraints[i]->GetConstraint<TEmptyConstraintNode>()) {
+            content.reset();
+            break;
         }
     }