[CBO] Added DontShuffle / NoOrdering enums (#19321)

Co-authored-by: Pavel Ivanov <pudge1000-7@qavm-9f0570a4.qemu>

Author: pashandor789

ydb/library/yql/dq/opt/dq_opt_join_hypergraph.h

@@ -1,24 +1,21 @@
 #pragma once
 
-#include <numeric>
-#include <list>
-#include <unordered_set>
-
 #include <util/string/join.h>
 #include <util/string/printf.h>
 #include <util/string/builder.h>
 
 #include "bitset.h"
 
+
+#include "dq_opt_join_tree_node.h"
+
 #include <yql/essentials/core/cbo/cbo_optimizer_new.h>
 #include <yql/essentials/core/yql_cost_function.h>
 #include <library/cpp/iterator/zip.h>
 #include <library/cpp/disjoint_sets/disjoint_sets.h>
 #include <yql/essentials/core/cbo/cbo_interesting_orderings.h>
 #include <yql/essentials/utils/log/log.h>
 
-#include "dq_opt_conflict_rules_collector.h"
-
 
 namespace NYql::NDq {
 
@@ -68,8 +65,8 @@ class TJoinHypergraph {
 
         // for interesting orderings framework
         TOrderingsStateMachine::TFDSet FDs;
-        std::int64_t LeftJoinKeysShuffleOrderingIdx = -1;
-        std::int64_t RightJoinKeysShuffleOrderingIdx = -1;
+        std::int64_t LeftJoinKeysShuffleOrderingIdx = TJoinOptimizerNodeInternal::NoOrdering;
+        std::int64_t RightJoinKeysShuffleOrderingIdx = TJoinOptimizerNodeInternal::NoOrdering;
 
         // JoinKind may not be commutative, so we need to know which edge is original and which is reversed.
         bool IsReversed;

ydb/library/yql/dq/opt/dq_opt_join_tree_node.cpp

@@ -48,12 +48,15 @@ std::shared_ptr<TJoinOptimizerNode> ConvertFromInternal(
     auto newJoin = std::make_shared<TJoinOptimizerNode>(left, right, join->LeftJoinKeys, join->RightJoinKeys, join->JoinType, join->JoinAlgo, join->LeftAny, join->RightAny);
     newJoin->Stats = std::move(join->Stats);
 
-    if (!enableShuffleElimination && join->JoinAlgo == EJoinAlgoType::GraceJoin) {
+    if (
+        !enableShuffleElimination && join->JoinAlgo == EJoinAlgoType::GraceJoin ||
+        join->ShuffleLeftSideByOrderingIdx == TJoinOptimizerNodeInternal::NoOrdering
+    ) {
         left->Stats.ShuffledByColumns =
             TIntrusivePtr<TOptimizerStatistics::TShuffledByColumns>(
                 new TOptimizerStatistics::TShuffledByColumns(join->LeftJoinKeys)
             );
-    } else if (join->ShuffleLeftSideByOrderingIdx != -1 && fdStorage) {
+    } else if (join->ShuffleLeftSideByOrderingIdx >= 0 && fdStorage) {
         auto shuffledBy = fdStorage->GetInterestingOrderingsColumnNamesByIdx(join->ShuffleLeftSideByOrderingIdx);
 
         left->Stats.ShuffledByColumns =
@@ -64,12 +67,15 @@ std::shared_ptr<TJoinOptimizerNode> ConvertFromInternal(
         left->Stats.ShuffledByColumns = nullptr;
     }
 
-    if (!enableShuffleElimination && join->JoinAlgo == EJoinAlgoType::GraceJoin) {
+    if (
+        (!enableShuffleElimination && join->JoinAlgo == EJoinAlgoType::GraceJoin) ||
+        join->ShuffleRightSideByOrderingIdx == TJoinOptimizerNodeInternal::NoOrdering
+    ) {
         right->Stats.ShuffledByColumns =
             TIntrusivePtr<TOptimizerStatistics::TShuffledByColumns>(
                 new TOptimizerStatistics::TShuffledByColumns(join->RightJoinKeys)
             );
-    } else if (join->ShuffleRightSideByOrderingIdx != -1 && fdStorage) {
+    } else if (join->ShuffleRightSideByOrderingIdx >= 0 && fdStorage) {
         auto shuffledBy = fdStorage->GetInterestingOrderingsColumnNamesByIdx(join->ShuffleRightSideByOrderingIdx);
 
         right->Stats.ShuffledByColumns =

ydb/library/yql/dq/opt/dq_opt_join_tree_node.h

@@ -88,9 +88,14 @@ struct TJoinOptimizerNodeInternal : public IBaseOptimizerNode {
     const bool LeftAny;
     const bool RightAny;
 
+    enum {
+        NoOrdering = -1,
+        DontShuffle = -2
+    };
+
     // for interesting orderings framework
-    std::int64_t ShuffleLeftSideByOrderingIdx  = -1;
-    std::int64_t ShuffleRightSideByOrderingIdx = -1;
+    std::int64_t ShuffleLeftSideByOrderingIdx  = DontShuffle;
+    std::int64_t ShuffleRightSideByOrderingIdx = DontShuffle;
 };
 
 /**