Skip to content

Commit 55445ed

Browse files
committed
make updates backward-compatible
1 parent ad7341c commit 55445ed

File tree

5 files changed

+8
-9
lines changed

5 files changed

+8
-9
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -668,8 +668,8 @@ IComputationNode* WrapMatchRecognizeCore(TCallable& callable, const TComputation
668668
for (size_t i = 0; i != AS_VALUE(TListLiteral, varNames)->GetItemsCount(); ++i) {
669669
defines.push_back(callable.GetInput(inputIndex++));
670670
}
671-
const auto& afterMatchSkipPastLastRow = callable.GetInput(inputIndex++);
672671
const auto& streamingMode = callable.GetInput(inputIndex++);
672+
const auto& afterMatchSkipPastLastRow = callable.GetInput(inputIndex++);
673673
MKQL_ENSURE(callable.GetInputsCount() == inputIndex, "Wrong input count");
674674

675675
const auto& [vars, varsLookup] = ConvertListOfStrings(varNames);

ydb/library/yql/minikql/comp_nodes/ut/mkql_match_recognize_ut.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ namespace NKikimr {
115115
{NYql::NMatchRecognize::TRowPatternFactor{"A", 3, 3, false, false, false}}
116116
},
117117
getDefines,
118-
false,
119118
streamingMode);
120119

121120
auto graph = setup.BuildGraph(pgmReturn);

ydb/library/yql/minikql/mkql_program_builder.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5973,8 +5973,8 @@ TRuntimeNode TProgramBuilder::MatchRecognizeCore(
59735973
const TArrayRef<std::pair<TStringBuf, TBinaryLambda>>& getMeasures,
59745974
const NYql::NMatchRecognize::TRowPattern& pattern,
59755975
const TArrayRef<std::pair<TStringBuf, TTernaryLambda>>& getDefines,
5976-
bool afterMatchSkipPastLastRow,
5977-
bool streamingMode
5976+
bool streamingMode,
5977+
bool afterMatchSkipPastLastRow
59785978
) {
59795979
MKQL_ENSURE(RuntimeVersion >= 42, "MatchRecognize is not supported in runtime version " << RuntimeVersion);
59805980

@@ -6127,8 +6127,8 @@ TRuntimeNode TProgramBuilder::MatchRecognizeCore(
61276127
for (const auto& d: defineNodes) {
61286128
callableBuilder.Add(d);
61296129
}
6130-
callableBuilder.Add(NewDataLiteral(afterMatchSkipPastLastRow));
61316130
callableBuilder.Add(NewDataLiteral(streamingMode));
6131+
callableBuilder.Add(NewDataLiteral(afterMatchSkipPastLastRow));
61326132
return TRuntimeNode(callableBuilder.Build(), false);
61336133
}
61346134

ydb/library/yql/minikql/mkql_program_builder.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -713,8 +713,8 @@ class TProgramBuilder : public TTypeBuilder {
713713
const TArrayRef<std::pair<TStringBuf, TBinaryLambda>>& getMeasures,
714714
const NYql::NMatchRecognize::TRowPattern& pattern,
715715
const TArrayRef<std::pair<TStringBuf, TTernaryLambda>>& getDefines,
716-
bool afterMatchSkipPastLastRow,
717-
bool streamingMode
716+
bool streamingMode,
717+
bool afterMatchSkipPastLastRow = false
718718
);
719719

720720
TRuntimeNode TimeOrderRecover(

ydb/library/yql/providers/common/mkql/yql_provider_mkql.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -934,8 +934,8 @@ TMkqlCommonCallableCompiler::TShared::TShared() {
934934
getMeasures,
935935
NYql::NMatchRecognize::ConvertPattern(pattern, ctx.ExprCtx),
936936
getDefines,
937-
afterMatchSkipPastLastRow,
938-
streamingMode
937+
streamingMode,
938+
afterMatchSkipPastLastRow
939939
);
940940
});
941941

0 commit comments

Comments
 (0)