review fixes

Author: lll-phill-lll

ydb/library/yql/dq/tasks/dq_task_program.cpp

@@ -17,7 +17,7 @@ class TSpillingTransformProvider {
     TSpillingTransformProvider(const TSpillingSettings& spillingSettings): SpillingSettings(spillingSettings){};
 
     TCallableVisitFunc operator()(TInternName name) {
-        if (RuntimeVersion >= 50U && SpillingSettings.EnableSpillingInGraceJoin && (name == "GraceJoin" || name == "GraceSelfJoin")) {
+        if (RuntimeVersion >= 50U && SpillingSettings.IsGraceJoinSpillingEnabled() && (name == "GraceJoin" || name == "GraceSelfJoin")) {
             return [name](NKikimr::NMiniKQL::TCallable& callable, const TTypeEnvironment& env) {
                 TCallableBuilder callableBuilder(env,
                     TStringBuilder() << callable.GetType()->GetName() << "WithSpilling",

ydb/library/yql/dq/tasks/dq_task_program.h

@@ -7,14 +7,25 @@
 #include <ydb/library/yql/providers/common/mkql/yql_provider_mkql.h>
 #include <ydb/library/yql/providers/common/provider/yql_provider.h>
 
+#include <ydb/library/yql/providers/dq/common/yql_dq_settings.h>
+
 namespace NYql::NDq {
 
-struct TSpillingSettings {
+class TSpillingSettings {
+public:
+    TSpillingSettings() = default;
+    explicit TSpillingSettings(ui64 mask) : Mask(mask) {};
+     
     operator bool() const {
-        return EnableSpillingInGraceJoin;
+        return Mask;
+    }
+
+    bool IsGraceJoinSpillingEnabled() const {
+        return Mask & ui64(TDqConfiguration::EEnabledSpillingNodes::GraceJoin);
     }
-    
-    bool EnableSpillingInGraceJoin = false;
+
+private:
+    const ui64 Mask = 0;
 };
 
 const TStructExprType* CollectParameters(NNodes::TCoLambda program, TExprContext& ctx);

ydb/library/yql/minikql/comp_nodes/mkql_grace_join.cpp

@@ -1171,13 +1171,13 @@ IComputationNode* WrapGraceJoinCommon(TCallable& callable, const TComputationNod
 IComputationNode* WrapGraceJoin(TCallable& callable, const TComputationNodeFactoryContext& ctx) {
     MKQL_ENSURE(callable.GetInputsCount() == 8, "Expected 8 args");
 
-    return WrapGraceJoinCommon(callable, ctx, false, callable.IsSpillingSupported());
+    return WrapGraceJoinCommon(callable, ctx, false, HasSpillingFlag(callable));
 }
 
 IComputationNode* WrapGraceSelfJoin(TCallable& callable, const TComputationNodeFactoryContext& ctx) {
     MKQL_ENSURE(callable.GetInputsCount() == 7, "Expected 7 args");
 
-    return WrapGraceJoinCommon(callable, ctx, true, callable.IsSpillingSupported());
+    return WrapGraceJoinCommon(callable, ctx, true, HasSpillingFlag(callable));
 }
 
 }

ydb/library/yql/minikql/mkql_node.h

@@ -1075,10 +1075,6 @@ friend class TNode;
         UniqueId = uniqueId;
     }
 
-    bool IsSpillingSupported() const {
-        return TStringBuf(GetType()->GetName()).EndsWith("WithSpilling"_sb);
-    }
-
 private:
     TCallable(ui32 inputsCount, TRuntimeNode* inputs, TCallableType* type, bool validate = true);
     TCallable(TRuntimeNode result, TCallableType* type, bool validate = true);

ydb/library/yql/minikql/mkql_program_builder.h

@@ -86,6 +86,10 @@ inline void AddAnyJoinSide(EAnyJoinSettings& combined, EAnyJoinSettings value) {
     combined = (EAnyJoinSettings)combinedVal;
 }
 
+inline bool HasSpillingFlag(const TCallable& callable) {
+    return TStringBuf(callable.GetType()->GetName()).EndsWith("WithSpilling"_sb);
+}
+
 #define MKQL_SCRIPT_TYPES(xx) \
     xx(Unknown, 0, unknown, false) \
     xx(Python, 1, python, false) \

ydb/library/yql/providers/dq/common/yql_dq_settings.cpp

@@ -109,9 +109,6 @@ TDqConfiguration::TDqConfiguration() {
                     throw yexception() << "Empty value item";
                 }
                 auto value = FromString<EEnabledSpillingNodes>(s);
-                if (value == EEnabledSpillingNodes::All) {
-                    return ui64(-1);
-                }
                 res |= ui64(value);
             }
             return res;

ydb/library/yql/providers/dq/common/yql_dq_settings.h

@@ -30,7 +30,7 @@ struct TDqSettings {
 
     enum class EEnabledSpillingNodes : ui64 {
         GraceJoin   = 1ULL      /* "GraceJoin" */,
-        All         = 64ULL     /* "All" */,
+        All         = ~0ULL     /* "All" */,
     };
 
     struct TDefault {
@@ -223,9 +223,9 @@ struct TDqSettings {
         return SpillingEngine.Get().GetOrElse(TDqSettings::TDefault::SpillingEngine) != ESpillingEngine::Disable;
     }
 
-    bool IsSpillingInGraceJoinEnabled() const {
-        ui64 mask = EnableSpillingNodes.Get().GetOrElse(0);
-        return IsSpillingEnabled() && (mask & ui64(EEnabledSpillingNodes::GraceJoin));
+    ui64 GetEnabledSpillingNodes() const {
+        if (!IsSpillingEnabled()) return 0;
+        return EnableSpillingNodes.Get().GetOrElse(0);
     }
 
     bool IsDqReplicateEnabled(const TTypeAnnotationContext& typesCtx) const {

ydb/library/yql/providers/dq/planner/execution_planner.cpp

@@ -676,7 +676,7 @@ namespace NYql::NDqs {
                 Y_ABORT_UNLESS(false);
             }
 */
-            TSpillingSettings spillingSettings{Settings->IsSpillingInGraceJoinEnabled()};
+            TSpillingSettings spillingSettings{Settings->GetEnabledSpillingNodes()};
             StagePrograms[stageInfo.first] = std::make_tuple(
                 NDq::BuildProgram(
                     stage.Program(), *paramsType, compiler, typeEnv, *FunctionRegistry,

ydb/library/yql/providers/dq/provider/exec/yql_dq_exectransformer.cpp

@@ -761,7 +761,7 @@ class TDqExecTransformer: public TExecTransformerBase, TCounters
 
             TVector<TExprBase> fakeReads;
             auto paramsType = NDq::CollectParameters(programLambda, ctx);
-            NDq::TSpillingSettings spillingSettings{State->Settings->IsSpillingInGraceJoinEnabled()};
+            NDq::TSpillingSettings spillingSettings{State->Settings->GetEnabledSpillingNodes()};
             *lambda = NDq::BuildProgram(
                 programLambda, *paramsType, compiler, typeEnv, *State->FunctionRegistry,
                 ctx, fakeReads, spillingSettings);