Merge c751223 into b765769

Author: uzhastik

ydb/library/yql/ast/yql_constraint.cpp

@@ -542,7 +542,8 @@ TSortedConstraintNode::DoGetSimplifiedForType(const TTypeAnnotationNode& type, T
                         ++it;
 
                     if (ssize_t(GetElementsCount(subType)) == std::distance(from, it)) {
-                        *from++ = std::make_pair(TPartOfConstraintBase::TSetType{std::move(prefix)}, from->second);
+                        *from = std::make_pair(TPartOfConstraintBase::TSetType{std::move(prefix)}, from->second);
+                        ++from;
                         it = content.erase(from, it);
                         changed = setChanged = true;
                     }

ydb/library/yql/core/common_opt/yql_co_simple1.cpp

@@ -3086,9 +3086,11 @@ std::unordered_set<ui32> GetUselessSortedJoinInputs(const TCoEquiJoin& equiJoin)
 
         if (!joinTree->Head().IsAtom("Cross")) {
             std::unordered_map<std::string_view, TPartOfConstraintBase::TSetType> tableJoinKeys;
-            for (const auto keys : {joinTree->Child(3), joinTree->Child(4)})
+            for (const auto keys : {joinTree->Child(3), joinTree->Child(4)}) {
                 for (ui32 i = 0U; i < keys->ChildrenSize(); ++i)
-                    tableJoinKeys[keys->Child(i)->Content()].insert_unique(TPartOfConstraintBase::TPathType(1U, keys->Child(++i)->Content()));
+                    tableJoinKeys[keys->Child(i)->Content()].insert_unique(TPartOfConstraintBase::TPathType(1U, keys->Child(i + 1)->Content()));
+                    ++i;
+                }
 
             for (const auto& [label, joinKeys]: tableJoinKeys) {
                 if (const auto it = sorteds.find(label); sorteds.cend() != it) {