Drop SqlInWithNothingOrNull feature flag

commit_hash:1980242770cd95d5974e385c2cbbc670a17bd1d8

1 files changed, 3 insertions, 10 deletions

diff --git a/yql/essentials/core/common_opt/yql_co_simple1.cpp b/yql/essentials/core/common_opt/yql_co_simple1.cpp
index 660b96b6626..93b0181b069 100644
--- a/yql/essentials/core/common_opt/yql_co_simple1.cpp
+++ b/yql/essentials/core/common_opt/yql_co_simple1.cpp
@@ -4138,12 +4138,6 @@ TExprNode::TPtr MemberOverFilterSkipNullMembers(const TExprNode::TPtr& node, TEx
     return node;
 }
 
-bool IsSqlWithNothingOrNullOpsEnabled(const TOptimizeContext& optCtx) {
-    static const char OptName[] = "SqlInWithNothingOrNull";
-    YQL_ENSURE(optCtx.Types);
-    return !IsOptimizerDisabled<OptName>(*optCtx.Types);
-}
-
 } // namespace
 
 void RegisterCoSimpleCallables1(TCallableOptimizerMap& map) {
@@ -4671,7 +4665,7 @@ void RegisterCoSimpleCallables1(TCallableOptimizerMap& map) {
             .Build();
     };
 
-    map["SqlIn"] = [](const TExprNode::TPtr& node, TExprContext& ctx, TOptimizeContext& opCtx) {
+    map["SqlIn"] = [](const TExprNode::TPtr& node, TExprContext& ctx, TOptimizeContext& /*opCtx*/) {
         auto collection = node->HeadPtr();
         auto lookup = node->ChildPtr(1);
         auto options = node->ChildPtr(2);
@@ -4791,8 +4785,7 @@ void RegisterCoSimpleCallables1(TCallableOptimizerMap& map) {
         }
 
         auto lookupTypeNoOpt = RemoveAllOptionals(lookup->GetTypeAnn());
-        if ((lookupTypeNoOpt->GetKind() == ETypeAnnotationKind::Null) ||
-            (lookup->IsCallable("Nothing") && IsSqlWithNothingOrNullOpsEnabled(opCtx))) {
+        if ((lookupTypeNoOpt->GetKind() == ETypeAnnotationKind::Null) || lookup->IsCallable("Nothing")) {
             const auto logString = lookupTypeNoOpt->GetKind() == ETypeAnnotationKind::Null ? "NULL IN" : "Nothing IN";
             if (isAnsi) {
                 YQL_CLOG(DEBUG, Core) << logString;
@@ -4804,7 +4797,7 @@ void RegisterCoSimpleCallables1(TCallableOptimizerMap& map) {
                         .Seal()
                     .Seal()
                     .Build();
-            } else if (IsSqlWithNothingOrNullOpsEnabled(opCtx)) {
+            } else {
                 YQL_CLOG(DEBUG, Core) << logString;
                 return MakeBoolNothing(node->Pos(), ctx);
             }