Skip to content

fix coverity issues: evaluation order violations #1556

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
uzhastik merged 4 commits into from
Feb 5, 2024
Merged

fix coverity issues: evaluation order violations #1556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c751223
fix coverity issues
uzhastik Feb 2, 2024
2a9a789
fix build
uzhastik Feb 2, 2024
0721a59
fix build
uzhastik Feb 2, 2024
8a34c44
fix build again
uzhastik Feb 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ydb/library/yql/ast/yql_constraint.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions ydb/library/yql/core/common_opt/yql_co_simple1.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3087,8 +3087,8 @@ 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 (ui32 i = 0U; i < keys->ChildrenSize(); ++i)
tableJoinKeys[keys->Child(i)->Content()].insert_unique(TPartOfConstraintBase::TPathType(1U, keys->Child(++i)->Content()));
for (ui32 i = 0U; i < keys->ChildrenSize(); i += 2)
tableJoinKeys[keys->Child(i)->Content()].insert_unique(TPartOfConstraintBase::TPathType(1U, keys->Child(i + 1)->Content()));

for (const auto& [label, joinKeys]: tableJoinKeys) {
if (const auto it = sorteds.find(label); sorteds.cend() != it) {
Expand Down