diff options
author | imunkin <imunkin@yandex-team.com> | 2025-03-04 12:31:00 +0300 |
---|---|---|
committer | imunkin <imunkin@yandex-team.com> | 2025-03-04 12:50:35 +0300 |
commit | adb5fe0f23f50f6ad4ce8b9492e496dd4628e95c (patch) | |
tree | be1477a6ec13ba562a758ffc83201d4a4744f3ff /yql/essentials/minikql/comp_nodes | |
parent | d8a124a50d0c6f85ff252c02db51c4e648c55cf2 (diff) | |
download | ydb-adb5fe0f23f50f6ad4ce8b9492e496dd4628e95c.tar.gz |
YQL-19623: Drop MKQL support for runtime versions <20
commit_hash:78108621c2faeeedc8d1d2aba988e271d339575c
Diffstat (limited to 'yql/essentials/minikql/comp_nodes')
10 files changed, 17 insertions, 20 deletions
diff --git a/yql/essentials/minikql/comp_nodes/ut/mkql_flatmap_ut.cpp b/yql/essentials/minikql/comp_nodes/ut/mkql_flatmap_ut.cpp index 12c11e4813..e8282e94d7 100644 --- a/yql/essentials/minikql/comp_nodes/ut/mkql_flatmap_ut.cpp +++ b/yql/essentials/minikql/comp_nodes/ut/mkql_flatmap_ut.cpp @@ -522,7 +522,7 @@ Y_UNIT_TEST_SUITE(TMiniKQLFlatMapTest) { UNIT_ASSERT(!iterator.Next(item)); UNIT_ASSERT(!iterator.Next(item)); } -#if !defined(MKQL_RUNTIME_VERSION) || MKQL_RUNTIME_VERSION >= 18u + Y_UNIT_TEST_LLVM(TestNarrowWithList) { TSetup<LLVM> setup; TProgramBuilder& pb = *setup.PgmBuilder; @@ -846,7 +846,6 @@ Y_UNIT_TEST_SUITE(TMiniKQLFlatMapTest) { UNIT_ASSERT_VALUES_EQUAL(NUdf::EFetchStatus::Finish, iterator.Fetch(item)); UNIT_ASSERT_VALUES_EQUAL(NUdf::EFetchStatus::Finish, iterator.Fetch(item)); } -#endif } } diff --git a/yql/essentials/minikql/comp_nodes/ut/mkql_join_ut.cpp b/yql/essentials/minikql/comp_nodes/ut/mkql_join_ut.cpp index d404644972..3731ff1539 100644 --- a/yql/essentials/minikql/comp_nodes/ut/mkql_join_ut.cpp +++ b/yql/essentials/minikql/comp_nodes/ut/mkql_join_ut.cpp @@ -116,7 +116,7 @@ Y_UNIT_TEST_SUITE(TMiniKQLCommonJoinCoreTupleTest) { UNIT_ASSERT(!iterator.Next(item)); } } -#if !defined(MKQL_RUNTIME_VERSION) || MKQL_RUNTIME_VERSION >= 18u + Y_UNIT_TEST_SUITE(TMiniKQLCommonJoinCoreWideTest) { Y_UNIT_TEST_LLVM(Inner) { TSetup<LLVM> setup; @@ -323,7 +323,7 @@ Y_UNIT_TEST_SUITE(TMiniKQLCommonJoinCoreWideTest) { UNIT_ASSERT(!iterator.Next(item)); } } -#endif + } } diff --git a/yql/essentials/minikql/comp_nodes/ut/mkql_map_join_ut.cpp b/yql/essentials/minikql/comp_nodes/ut/mkql_map_join_ut.cpp index e68d4bd46e..fe734804ea 100644 --- a/yql/essentials/minikql/comp_nodes/ut/mkql_map_join_ut.cpp +++ b/yql/essentials/minikql/comp_nodes/ut/mkql_map_join_ut.cpp @@ -585,7 +585,7 @@ Y_UNIT_TEST_SUITE(TMiniKQLMapJoinCoreTest) { } } } -#if !defined(MKQL_RUNTIME_VERSION) || MKQL_RUNTIME_VERSION >= 18u + Y_UNIT_TEST_SUITE(TMiniKQLWideMapJoinCoreTest) { Y_UNIT_TEST_LLVM(TestInner) { for (ui32 pass = 0; pass < 1; ++pass) { @@ -1144,7 +1144,7 @@ Y_UNIT_TEST_SUITE(TMiniKQLWideMapJoinCoreTest) { } } } -#endif + } } diff --git a/yql/essentials/minikql/comp_nodes/ut/mkql_multimap_ut.cpp b/yql/essentials/minikql/comp_nodes/ut/mkql_multimap_ut.cpp index 5dcb30db2e..d6735151f6 100644 --- a/yql/essentials/minikql/comp_nodes/ut/mkql_multimap_ut.cpp +++ b/yql/essentials/minikql/comp_nodes/ut/mkql_multimap_ut.cpp @@ -121,7 +121,7 @@ Y_UNIT_TEST_SUITE(TMiniKQLMultiMapTest) { UNIT_ASSERT(!iterator.Next(item)); UNIT_ASSERT(!iterator.Next(item)); } -#if !defined(MKQL_RUNTIME_VERSION) || MKQL_RUNTIME_VERSION >= 18u + Y_UNIT_TEST_LLVM(TestFlattenByNarrow) { TSetup<LLVM> setup; TProgramBuilder& pb = *setup.PgmBuilder; @@ -164,7 +164,6 @@ Y_UNIT_TEST_SUITE(TMiniKQLMultiMapTest) { UNIT_ASSERT(!iterator.Next(item)); UNIT_ASSERT(!iterator.Next(item)); } -#endif } } diff --git a/yql/essentials/minikql/comp_nodes/ut/mkql_wide_chopper_ut.cpp b/yql/essentials/minikql/comp_nodes/ut/mkql_wide_chopper_ut.cpp index 554dd8a3d3..95ce34a54c 100644 --- a/yql/essentials/minikql/comp_nodes/ut/mkql_wide_chopper_ut.cpp +++ b/yql/essentials/minikql/comp_nodes/ut/mkql_wide_chopper_ut.cpp @@ -3,7 +3,7 @@ namespace NKikimr { namespace NMiniKQL { -#if !defined(MKQL_RUNTIME_VERSION) || MKQL_RUNTIME_VERSION >= 18u + Y_UNIT_TEST_SUITE(TMiniKQLWideChopperTest) { Y_UNIT_TEST_LLVM(TestConcatKeyToItems) { TSetup<LLVM> setup; @@ -468,7 +468,7 @@ Y_UNIT_TEST_SUITE(TMiniKQLWideChopperTest) { UNIT_ASSERT(!iterator.Next(item)); } } -#endif + } } diff --git a/yql/essentials/minikql/comp_nodes/ut/mkql_wide_combine_ut.cpp b/yql/essentials/minikql/comp_nodes/ut/mkql_wide_combine_ut.cpp index 55cb6babbf..4e4d13163c 100644 --- a/yql/essentials/minikql/comp_nodes/ut/mkql_wide_combine_ut.cpp +++ b/yql/essentials/minikql/comp_nodes/ut/mkql_wide_combine_ut.cpp @@ -155,7 +155,6 @@ void CheckIfStreamHasExpectedStringValues(const NUdf::TUnboxedValue& streamValue } // unnamed -#if !defined(MKQL_RUNTIME_VERSION) || MKQL_RUNTIME_VERSION >= 18u Y_UNIT_TEST_SUITE(TMiniKQLWideCombinerTest) { Y_UNIT_TEST_LLVM(TestLongStringsRefCounting) { TSetup<LLVM> setup; @@ -1065,7 +1064,7 @@ Y_UNIT_TEST_SUITE(TMiniKQLWideCombinerPerfTest) { Cerr << "Runtime is " << t2 - t1 << " vs C++ " << cppTime << Endl; } } -#endif + #if !defined(MKQL_RUNTIME_VERSION) || MKQL_RUNTIME_VERSION >= 29u Y_UNIT_TEST_SUITE(TMiniKQLWideLastCombinerTest) { Y_UNIT_TEST_LLVM_SPILLING(TestLongStringsRefCounting) { diff --git a/yql/essentials/minikql/comp_nodes/ut/mkql_wide_condense_ut.cpp b/yql/essentials/minikql/comp_nodes/ut/mkql_wide_condense_ut.cpp index b231df462b..1313812732 100644 --- a/yql/essentials/minikql/comp_nodes/ut/mkql_wide_condense_ut.cpp +++ b/yql/essentials/minikql/comp_nodes/ut/mkql_wide_condense_ut.cpp @@ -3,7 +3,7 @@ namespace NKikimr { namespace NMiniKQL { -#if !defined(MKQL_RUNTIME_VERSION) || MKQL_RUNTIME_VERSION >= 18u + Y_UNIT_TEST_SUITE(TMiniKQLWideCondense1Test) { Y_UNIT_TEST_LLVM(TestConcatItemsToKey) { TSetup<LLVM> setup; @@ -167,7 +167,7 @@ Y_UNIT_TEST_SUITE(TMiniKQLWideCondense1Test) { UNIT_ASSERT(!iterator.Next(item)); } } -#endif + } } diff --git a/yql/essentials/minikql/comp_nodes/ut/mkql_wide_filter_ut.cpp b/yql/essentials/minikql/comp_nodes/ut/mkql_wide_filter_ut.cpp index 15c8516089..fd7b3f2f23 100644 --- a/yql/essentials/minikql/comp_nodes/ut/mkql_wide_filter_ut.cpp +++ b/yql/essentials/minikql/comp_nodes/ut/mkql_wide_filter_ut.cpp @@ -3,7 +3,7 @@ namespace NKikimr { namespace NMiniKQL { -#if !defined(MKQL_RUNTIME_VERSION) || MKQL_RUNTIME_VERSION >= 18u + Y_UNIT_TEST_SUITE(TMiniKQLWideFilterTest) { Y_UNIT_TEST_LLVM(TestPredicateExpression) { TSetup<LLVM> setup; @@ -381,6 +381,6 @@ Y_UNIT_TEST_SUITE(TMiniKQLWideFilterTest) { UNIT_ASSERT(!iterator.Next(item)); } } -#endif + } } diff --git a/yql/essentials/minikql/comp_nodes/ut/mkql_wide_map_ut.cpp b/yql/essentials/minikql/comp_nodes/ut/mkql_wide_map_ut.cpp index d1afec27f4..97c7d82d7b 100644 --- a/yql/essentials/minikql/comp_nodes/ut/mkql_wide_map_ut.cpp +++ b/yql/essentials/minikql/comp_nodes/ut/mkql_wide_map_ut.cpp @@ -3,7 +3,7 @@ namespace NKikimr { namespace NMiniKQL { -#if !defined(MKQL_RUNTIME_VERSION) || MKQL_RUNTIME_VERSION >= 18u + Y_UNIT_TEST_SUITE(TMiniKQLWideMapTest) { Y_UNIT_TEST_LLVM(TestSimpleSwap) { TSetup<LLVM> setup; @@ -330,6 +330,6 @@ Y_UNIT_TEST_SUITE(TMiniKQLWideMapTest) { UNIT_ASSERT(!iterator.Next(item)); } } -#endif + } } diff --git a/yql/essentials/minikql/comp_nodes/ut/mkql_wide_nodes_ut.cpp b/yql/essentials/minikql/comp_nodes/ut/mkql_wide_nodes_ut.cpp index 093810f0bc..1cbe7d774b 100644 --- a/yql/essentials/minikql/comp_nodes/ut/mkql_wide_nodes_ut.cpp +++ b/yql/essentials/minikql/comp_nodes/ut/mkql_wide_nodes_ut.cpp @@ -3,7 +3,7 @@ namespace NKikimr { namespace NMiniKQL { -#if !defined(MKQL_RUNTIME_VERSION) || MKQL_RUNTIME_VERSION >= 18u + Y_UNIT_TEST_SUITE(TMiniKQLWideNodesTest) { // TDOD: fixme #if 0 @@ -119,6 +119,6 @@ Y_UNIT_TEST_SUITE(TMiniKQLWideNodesTest) { } } -#endif + } } |