Don't report deprecated pragmas

commit_hash:79288de7d2b6f039cc49a0943aaf2432de52f8c0

Author: rvu1024

yql/essentials/data/language/pragmas_opensource.json

@@ -32,9 +32,6 @@
   {
     "name": "yt.BufferRowCount"
   },
-  {
-    "name": "yt.ClientMapTimeout"
-  },
   {
     "name": "yt.ColumnGroupMode"
   },
@@ -146,9 +143,6 @@
   {
     "name": "yt.ExpirationInterval"
   },
-  {
-    "name": "yt.ExtendTableLimit"
-  },
   {
     "name": "yt.ExtendedStatsMaxChunkCount"
   },
@@ -284,9 +278,6 @@
   {
     "name": "yt.JoinMergeUseSmallAsPrimary"
   },
-  {
-    "name": "yt.JoinUseColumnarStatistics"
-  },
   {
     "name": "yt.JoinWaitAllInputs"
   },
@@ -611,9 +602,6 @@
   {
     "name": "yt.UseFlow"
   },
-  {
-    "name": "yt.UseIntermediateSchema"
-  },
   {
     "name": "yt.UseIntermediateStreams"
   },
@@ -647,9 +635,6 @@
   {
     "name": "yt.UseTmpfs"
   },
-  {
-    "name": "yt.UseTypeV2"
-  },
   {
     "name": "yt.UseYqlRowSpecCompactForm"
   },

yql/essentials/providers/common/config/yql_dispatch.cpp

@@ -166,7 +166,9 @@ void TSettingDispatcher::Restore() {
 
 void TSettingDispatcher::Enumerate(std::function<void(std::string_view)> callback) {
     for (const auto& name : Names_) {
-        callback(name);
+        if (!Handlers_.at(NormalizeName(name))->IsDeprecated()) {
+            callback(name);
+        }
     }
 }
 

yql/essentials/providers/common/config/yql_dispatch.h

@@ -126,6 +126,7 @@ class TSettingDispatcher: public TThrRefBase {
         virtual void Restore(const TString& cluster) = 0;
         virtual bool IsRuntime() const = 0;
         virtual bool IsPerCluster() const = 0;
+        virtual bool IsDeprecated() const = 0;
 
     protected:
         TString Name_;
@@ -177,17 +178,17 @@ class TSettingDispatcher: public TThrRefBase {
         }
 
         void FreezeDefault() override {
-            Defaul_ = Setting_;
+            Default_ = Setting_;
         }
 
         void Restore(const TString& cluster) override {
-            if (!Defaul_) {
+            if (!Default_) {
                 ythrow yexception() << "Cannot restore " << Name_.Quote() << " setting without freeze";
             }
             if (ALL_CLUSTERS == cluster) {
-                Setting_ = Defaul_.GetRef();
+                Setting_ = Default_.GetRef();
             } else {
-                if (auto value = NPrivate::GetValue(Defaul_.GetRef(), cluster)) {
+                if (auto value = NPrivate::GetValue(Default_.GetRef(), cluster)) {
                     Setting_[cluster] = *value;
                 } else {
                     Setting_.Clear();
@@ -204,6 +205,10 @@ class TSettingDispatcher: public TThrRefBase {
             return Setting_.IsPerCluster();
         }
 
+        bool IsDeprecated() const override {
+            return Deprecated_;
+        }
+
         TSettingHandlerImpl& Lower(TType lower) {
             Validators_.push_back([lower](const TString&, TType value) {
                 if (value < lower) {
@@ -293,7 +298,7 @@ class TSettingDispatcher: public TThrRefBase {
 
         TSettingHandlerImpl& ValueSetterWithRestore(TValueCallback&& hook) {
             ValueSetter_ = [this, hook = std::move(hook)] (const TString& cluster, TType value) {
-                if (Defaul_) {
+                if (Default_) {
                     Restore(cluster);
                 }
                 hook(cluster, value);
@@ -303,7 +308,7 @@ class TSettingDispatcher: public TThrRefBase {
 
         TSettingHandlerImpl& ValueSetterWithRestore(const TValueCallback& hook) {
             ValueSetter_ = [this, hook] (const TString& cluster, TType value) {
-                if (Defaul_) {
+                if (Default_) {
                     Restore(cluster);
                 }
                 hook(cluster, value);
@@ -316,18 +321,20 @@ class TSettingDispatcher: public TThrRefBase {
             return *this;
         }
 
-        TSettingHandlerImpl& Deprecated() {
-            Warning_ = TStringBuilder() << "Pragma \"" << Name_ << "\" is deprecated and has no effect";
+        TSettingHandlerImpl& Deprecated(const TString& message = {}) {
+            Warning_ = message ? message : (TStringBuilder() << "Pragma \"" << Name_ << "\" is deprecated and has no effect");
+            Deprecated_ = true;
             return *this;
         }
 
     private:
         TConfSetting<TType, SettingType>& Setting_;
-        TMaybe<TConfSetting<TType, SettingType>> Defaul_;
+        TMaybe<TConfSetting<TType, SettingType>> Default_;
         ::NYql::NPrivate::TParser<TType> Parser_;
         TValueCallback ValueSetter_;
         TVector<TValueCallback> Validators_;
         TString Warning_;
+        bool Deprecated_ = false;
     };
 
     TSettingDispatcher() = default;

yt/yql/providers/yt/common/yql_yt_settings.cpp

@@ -165,7 +165,7 @@ TYtConfiguration::TYtConfiguration(TTypeAnnotationContext& typeCtx)
             Y_UNUSED(cluster);
             UseNativeYtTypes = value;
         })
-        .Warning("Pragma UseTypeV2 is deprecated. Use UseNativeYtTypes instead");
+        .Deprecated("Pragma UseTypeV2 is deprecated. Use UseNativeYtTypes instead");
     REGISTER_SETTING(*this, UseNativeYtTypes);
     REGISTER_SETTING(*this, UseNativeDescSort);
     REGISTER_SETTING(*this, UseIntermediateSchema).Deprecated();
@@ -295,7 +295,7 @@ TYtConfiguration::TYtConfiguration(TTypeAnnotationContext& typeCtx)
             Y_UNUSED(cluster);
             MaxInputTables = value;
         })
-        .Warning("Pragma ExtendTableLimit is deprecated. Use MaxInputTables instead");
+        .Deprecated("Pragma ExtendTableLimit is deprecated. Use MaxInputTables instead");
     REGISTER_SETTING(*this, CommonJoinCoreLimit);
     REGISTER_SETTING(*this, CombineCoreLimit).Lower(1_MB); // Min 1Mb
     REGISTER_SETTING(*this, SwitchLimit).Lower(1_MB); // Min 1Mb
@@ -334,7 +334,7 @@ TYtConfiguration::TYtConfiguration(TTypeAnnotationContext& typeCtx)
                 JoinCollectColumnarStatistics = EJoinCollectColumnarStatisticsMode::Disable;
             }
         })
-        .Warning("Pragma JoinUseColumnarStatistics is deprecated. Use JoinCollectColumnarStatistics instead");
+        .Deprecated("Pragma JoinUseColumnarStatistics is deprecated. Use JoinCollectColumnarStatistics instead");
     REGISTER_SETTING(*this, JoinCollectColumnarStatistics)
         .Parser([](const TString& v) { return FromString<EJoinCollectColumnarStatisticsMode>(v); });
     REGISTER_SETTING(*this, JoinColumnarStatisticsFetcherMode)