YQL-19623: Drop MKQL support for runtime versions <40

commit_hash:aa64eee443012fcb60cd00896f6f1b30d515048e

5 files changed, 1 insertions, 14 deletions

diff --git a/yql/essentials/minikql/comp_nodes/mkql_discard.cpp b/yql/essentials/minikql/comp_nodes/mkql_discard.cpp
index 969f029731..580a2761fe 100644
--- a/yql/essentials/minikql/comp_nodes/mkql_discard.cpp
+++ b/yql/essentials/minikql/comp_nodes/mkql_discard.cpp
@@ -226,7 +226,7 @@ IComputationNode* WrapDiscard(TCallable& callable, const TComputationNodeFactory
     if (type->IsFlow()) {
         if (const auto wide = dynamic_cast<IComputationWideFlowNode*>(flow)) {
             auto flowType = AS_TYPE(TFlowType, callable.GetInput(0U).GetStaticType());
-            if (RuntimeVersion > 35 && flowType->GetItemType()->IsMulti() || flowType->GetItemType()->IsTuple()) {
+            if (flowType->GetItemType()->IsMulti() || flowType->GetItemType()->IsTuple()) {
                 return new TDiscardWideFlowWrapper(wide, GetWideComponentsCount(flowType));
             }
             return new TDiscardWideFlowWrapper(wide, 0U);
diff --git a/yql/essentials/minikql/comp_nodes/ut/mkql_block_top_sort_ut.cpp b/yql/essentials/minikql/comp_nodes/ut/mkql_block_top_sort_ut.cpp
index 2066594e3d..5a0f737ec6 100644
--- a/yql/essentials/minikql/comp_nodes/ut/mkql_block_top_sort_ut.cpp
+++ b/yql/essentials/minikql/comp_nodes/ut/mkql_block_top_sort_ut.cpp
@@ -8,7 +8,6 @@
 namespace NKikimr {
 namespace NMiniKQL {
 
-#if !defined(MKQL_RUNTIME_VERSION) || MKQL_RUNTIME_VERSION >= 33u
 Y_UNIT_TEST_SUITE(TMiniKQLBlockTopTest) {
     Y_UNIT_TEST_LLVM(TopByFirstKeyAsc) {
         TSetup<LLVM> setup;
@@ -555,9 +554,7 @@ Y_UNIT_TEST_SUITE(TMiniKQLBlockTopTest) {
         UNIT_ASSERT(!iterator.Next(item));
     }
 }
-#endif
 
-#if !defined(MKQL_RUNTIME_VERSION) || MKQL_RUNTIME_VERSION >= 34u
 Y_UNIT_TEST_SUITE(TMiniKQLBlockSortTest) {
     Y_UNIT_TEST_LLVM(SortByFirstKeyAsc) {
         TSetup<LLVM> setup;
@@ -641,7 +638,6 @@ Y_UNIT_TEST_SUITE(TMiniKQLBlockSortTest) {
         UNIT_ASSERT(!iterator.Next(item));
     }
 }
-#endif
 
 }
 }
diff --git a/yql/essentials/minikql/comp_nodes/ut/mkql_grace_join_ut.cpp b/yql/essentials/minikql/comp_nodes/ut/mkql_grace_join_ut.cpp
index e8fbd575a9..3bedebe1c8 100644
--- a/yql/essentials/minikql/comp_nodes/ut/mkql_grace_join_ut.cpp
+++ b/yql/essentials/minikql/comp_nodes/ut/mkql_grace_join_ut.cpp
@@ -886,7 +886,6 @@ Y_UNIT_TEST_SUITE(TMiniKQLGraceSelfJoinTest) {
     }
 }
 
-#if !defined(MKQL_RUNTIME_VERSION) || MKQL_RUNTIME_VERSION >= 40u
 Y_UNIT_TEST_SUITE(TMiniKQLSelfJoinTest) {
 
     Y_UNIT_TEST_LLVM_SPILLING(TestInner1) {
@@ -1044,7 +1043,6 @@ Y_UNIT_TEST_SUITE(TMiniKQLSelfJoinTest) {
 
 
 }
-#endif
 
 Y_UNIT_TEST_SUITE(TMiniKQLGraceJoinTest) {
 
diff --git a/yql/essentials/minikql/comp_nodes/ut/mkql_wide_stream_ut.cpp b/yql/essentials/minikql/comp_nodes/ut/mkql_wide_stream_ut.cpp
index 89582bf31f..d869069997 100644
--- a/yql/essentials/minikql/comp_nodes/ut/mkql_wide_stream_ut.cpp
+++ b/yql/essentials/minikql/comp_nodes/ut/mkql_wide_stream_ut.cpp
@@ -5,7 +5,6 @@
 namespace NKikimr {
 namespace NMiniKQL {
 
-#if !defined(MKQL_RUNTIME_VERSION) || MKQL_RUNTIME_VERSION >= 36u
 Y_UNIT_TEST_SUITE(TMiniKQLWideStreamTest) {
 
 Y_UNIT_TEST_LLVM(TestSimple) {
@@ -52,7 +51,5 @@ Y_UNIT_TEST_LLVM(TestSimple) {
 }
 }
 
-#endif
-
 }
 }
diff --git a/yql/essentials/minikql/comp_nodes/ut/mkql_wide_top_sort_ut.cpp b/yql/essentials/minikql/comp_nodes/ut/mkql_wide_top_sort_ut.cpp
index 0608a3be45..b26c538aeb 100644
--- a/yql/essentials/minikql/comp_nodes/ut/mkql_wide_top_sort_ut.cpp
+++ b/yql/essentials/minikql/comp_nodes/ut/mkql_wide_top_sort_ut.cpp
@@ -8,7 +8,6 @@
 namespace NKikimr {
 namespace NMiniKQL {
 
-#if !defined(MKQL_RUNTIME_VERSION) || MKQL_RUNTIME_VERSION >= 33u
 Y_UNIT_TEST_SUITE(TMiniKQLWideTopTest) {
     Y_UNIT_TEST_LLVM(TopByFirstKeyAsc) {
         TSetup<LLVM> setup;
@@ -562,9 +561,7 @@ Y_UNIT_TEST_SUITE(TMiniKQLWideTopTest) {
         UNIT_ASSERT(!iterator.Next(item));
     }
 }
-#endif
 
-#if !defined(MKQL_RUNTIME_VERSION) || MKQL_RUNTIME_VERSION >= 34u
 Y_UNIT_TEST_SUITE(TMiniKQLWideSortTest) {
     Y_UNIT_TEST_LLVM(SortByFirstKeyAsc) {
         TSetup<LLVM> setup;
@@ -644,7 +641,6 @@ Y_UNIT_TEST_SUITE(TMiniKQLWideSortTest) {
         UNIT_ASSERT(!iterator.Next(item));
     }
 }
-#endif
 
 }
 }