Fix introduced bugs

Author: Vadim Averin

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

@@ -136,7 +136,7 @@ using TBaseComputation = TSimpleStatefulWideFlowCodegeneratorNode<TWideSkipWrapp
          return skipCount == 0 ? output : ctx.WideFields.data() + StubsIndex;
      }
 
-    EProcessResult DoProcess(ui64& skipCount, TComputationContext&, EFetchResult fetchRes, NUdf::TUnboxedValue*const*, NUdf::TUnboxedValue*const*) const {
+    EProcessResult DoProcess(ui64& skipCount, TComputationContext&, EFetchResult fetchRes, NUdf::TUnboxedValue*const*) const {
         if (fetchRes == EFetchResult::One && skipCount) {
             skipCount--;
             return EProcessResult::Fetch;

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

@@ -111,7 +111,7 @@ using TBaseComputation = TSimpleStatefulWideFlowCodegeneratorNode<TWideTakeWrapp
         return takeCount != 0 ? output : nullptr;
     }
 
-    EProcessResult DoProcess(ui64& takeCount, TComputationContext& , EFetchResult fetchRes, NUdf::TUnboxedValue*const*, NUdf::TUnboxedValue*const*) const {
+    EProcessResult DoProcess(ui64& takeCount, TComputationContext& , EFetchResult fetchRes, NUdf::TUnboxedValue*const*) const {
         if (takeCount == 0) {
             return EProcessResult::Finish;
         } else if (fetchRes == EFetchResult::One) {

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

@@ -156,13 +156,13 @@ using TBaseComputation = TSimpleStatefulWideFlowCodegeneratorNode<TWideFilterWit
         return limit != 0 ? PrepareArguments(ctx, output) : nullptr;
     }
 
-    EProcessResult DoProcess(ui64& limit, TComputationContext& ctx, EFetchResult fetchRes, NUdf::TUnboxedValue*const*, NUdf::TUnboxedValue*const* values) const {
+    EProcessResult DoProcess(ui64& limit, TComputationContext& ctx, EFetchResult fetchRes, NUdf::TUnboxedValue*const* output) const {
         if (limit == 0) {
             return EProcessResult::Finish;
         }
         if (fetchRes == EFetchResult::One) {
             if (Predicate->GetValue(ctx).Get<bool>()) {
-                FillOutputs(ctx, values);
+                FillOutputs(ctx, output);
                 limit--;
                 return EProcessResult::One;
             }
@@ -198,10 +198,10 @@ using TBaseComputation = TSimpleStatefulWideFlowCodegeneratorNode<TWideTakeWhile
     }
 
     NUdf::TUnboxedValue*const* PrepareInput(bool& stop, TComputationContext& ctx, NUdf::TUnboxedValue*const* output) const {
-        return !stop ? output : PrepareArguments(ctx, output);
+        return !stop ? PrepareArguments(ctx, output) : nullptr;
     }
 
-    TBaseComputation::EProcessResult DoProcess(bool& stop, TComputationContext& ctx, EFetchResult fetchRes, NUdf::TUnboxedValue*const*, NUdf::TUnboxedValue*const* values) const {
+    TBaseComputation::EProcessResult DoProcess(bool& stop, TComputationContext& ctx, EFetchResult fetchRes, NUdf::TUnboxedValue*const* output) const {
         if (stop) {
             return TBaseComputation::EProcessResult::Finish;
         }
@@ -211,7 +211,7 @@ using TBaseComputation = TSimpleStatefulWideFlowCodegeneratorNode<TWideTakeWhile
                 stop = true;
             }
             if (Inclusive || predicate) {
-                FillOutputs(ctx, values);
+                FillOutputs(ctx, output);
                 return TBaseComputation::EProcessResult::One;
             }
             return TBaseComputation::EProcessResult::Finish;
@@ -241,18 +241,18 @@ using TBaseComputation = TSimpleStatefulWideFlowCodegeneratorNode<TWideSkipWhile
         start = false;
     }
 
-    NUdf::TUnboxedValue*const* PrepareInput(bool&, TComputationContext&, NUdf::TUnboxedValue*const* output) const {
-        return output;
+    NUdf::TUnboxedValue*const* PrepareInput(bool& start, TComputationContext& ctx, NUdf::TUnboxedValue*const* output) const {
+        return start ? output : PrepareArguments(ctx, output);
     }
 
-    TBaseComputation::EProcessResult DoProcess(bool& start, TComputationContext& ctx, EFetchResult fetchRes, NUdf::TUnboxedValue*const*, NUdf::TUnboxedValue*const* values) const {
+    TBaseComputation::EProcessResult DoProcess(bool& start, TComputationContext& ctx, EFetchResult fetchRes, NUdf::TUnboxedValue*const* output) const {
         if (!start && fetchRes == EFetchResult::One) {
             const bool predicate = Predicate->GetValue(ctx).Get<bool>();
             if (!predicate) {
                 start = true;
             }
             if (!Inclusive && !predicate) {
-                FillOutputs(ctx, values);
+                FillOutputs(ctx, output);
                 return TBaseComputation::EProcessResult::One;
             }
             return TBaseComputation::EProcessResult::Fetch;

ydb/library/yql/minikql/computation/mkql_computation_node_codegen_impl.h

@@ -36,7 +36,7 @@ class TSimpleStatefulWideFlowCodegeneratorNode
         for (size_t pos = 0; pos < width; pos++) {
             valuePtrsVec[pos] = valuesVec.data() + pos;
         }
-        auto res = static_cast<const TDerived*>(this)->DoProcess(*static_cast<TState*>(state.GetRawPtr()), ctx, fetchRes, valuePtrsVec.data(), valuePtrsVec.data());
+        auto res = static_cast<const TDerived*>(this)->DoProcess(*static_cast<TState*>(state.GetRawPtr()), ctx, fetchRes, valuePtrsVec.data());
         for (size_t pos = 0; pos < width; pos++) {
             values[pos] = valuesVec[pos].Release();
         }
@@ -54,7 +54,7 @@ class TSimpleStatefulWideFlowCodegeneratorNode
         while (res == EProcessResult::Fetch) {
             auto *const *input = static_cast<const TDerived*>(this)->PrepareInput(*static_cast<TState*>(state.GetRawPtr()), ctx, output);
             auto fetchRes = input ? SourceFlow->FetchValues(ctx, input) : EFetchResult::One;
-            res = static_cast<const TDerived*>(this)->DoProcess(*static_cast<TState*>(state.GetRawPtr()), ctx, fetchRes, input, output);
+            res = static_cast<const TDerived*>(this)->DoProcess(*static_cast<TState*>(state.GetRawPtr()), ctx, fetchRes, output);
         }
         return static_cast<EFetchResult>(res);
     }