Refactor TConfSetting

commit_hash:2ca0a7e131758036bd15ba9e58dce176b9eff6c9

Author: nepal

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

@@ -76,6 +76,23 @@ TParser<TInstant> GetDefaultParser<TInstant>();
 YQL_PRIMITIVE_SETTING_PARSER_TYPES(YQL_DECLARE_SETTING_PARSER)
 YQL_CONTAINER_SETTING_PARSER_TYPES(YQL_DECLARE_SETTING_PARSER)
 
+#ifdef YQL_BETTER_CONF_SETTING_API
+template<typename TType>
+TMaybe<TType> GetValue(const NCommon::TConfSetting<TType, NCommon::EConfSettingType::StaticPerCluster>& setting, const TString& cluster) {
+    return setting.Get(cluster);
+}
+
+template<typename TType>
+TMaybe<TType> GetValue(const NCommon::TConfSetting<TType, NCommon::EConfSettingType::Dynamic>& setting, const TString& cluster) {
+    return setting.Get(cluster);
+}
+
+template<typename TType>
+TMaybe<TType> GetValue(const NCommon::TConfSetting<TType, NCommon::EConfSettingType::Static>& setting, const TString& cluster) {
+    Y_UNUSED(cluster);
+    return setting.Get();
+}
+#else
 template<typename TType>
 TMaybe<TType> GetValue(const NCommon::TConfSetting<TType, true, false>& setting, const TString& cluster) {
     return setting.Get(cluster);
@@ -96,6 +113,7 @@ TMaybe<TType> GetValue(const NCommon::TConfSetting<TType, false, false>& setting
     Y_UNUSED(cluster);
     return setting.Get();
 }
+#endif
 
 }
 
@@ -135,15 +153,23 @@ class TSettingDispatcher: public TThrRefBase {
         TString Name_;
     };
 
+#ifdef YQL_BETTER_CONF_SETTING_API
+    template <typename TType, EConfSettingType SettingType>
+#else
     template <typename TType, bool RUNTIME, bool PERCLUSTER>
-    class TSettingHandlerImpl: public TSettingHandler {
+#endif
+    class TSettingHandlerImpl : public TSettingHandler {
     public:
         using TValueCallback = std::function<void(const TString&, TType)>;
 
     private:
         friend class TSettingDispatcher;
 
+#ifdef YQL_BETTER_CONF_SETTING_API
+        TSettingHandlerImpl(const TString& name, TConfSetting<TType, SettingType>& setting)
+#else
         TSettingHandlerImpl(const TString& name, TConfSetting<TType, RUNTIME, PERCLUSTER>& setting)
+#endif
             : TSettingHandler(name)
             , Setting_(setting)
             , Parser_(::NYql::NPrivate::GetDefaultParser<TType>())
@@ -322,8 +348,13 @@ class TSettingDispatcher: public TThrRefBase {
         }
 
     private:
+#ifdef YQL_BETTER_CONF_SETTING_API
+        TConfSetting<TType, SettingType>& Setting_;
+        TMaybe<TConfSetting<TType, SettingType>> Defaul_;
+#else
         TConfSetting<TType, RUNTIME, PERCLUSTER>& Setting_;
         TMaybe<TConfSetting<TType, RUNTIME, PERCLUSTER>> Defaul_;
+#endif
         ::NYql::NPrivate::TParser<TType> Parser_;
         TValueCallback ValueSetter_;
         TVector<TValueCallback> Validators_;
@@ -349,9 +380,15 @@ class TSettingDispatcher: public TThrRefBase {
         ValidClusters.insert(cluster);
     }
 
+#ifdef YQL_BETTER_CONF_SETTING_API
+    template <typename TType, EConfSettingType SettingType>
+    TSettingHandlerImpl<TType, SettingType>& AddSetting(const TString& name, TConfSetting<TType, SettingType>& setting) {
+        TIntrusivePtr<TSettingHandlerImpl<TType, SettingType>> handler = new TSettingHandlerImpl<TType, SettingType>(name, setting);
+#else
     template <typename TType, bool RUNTIME, bool PERCLUSTER>
     TSettingHandlerImpl<TType, RUNTIME, PERCLUSTER>& AddSetting(const TString& name, TConfSetting<TType, RUNTIME, PERCLUSTER>& setting) {
         TIntrusivePtr<TSettingHandlerImpl<TType, RUNTIME, PERCLUSTER>> handler = new TSettingHandlerImpl<TType, RUNTIME, PERCLUSTER>(name, setting);
+#endif
         if (!Handlers.insert({NormalizeName(name), handler}).second) {
             ythrow yexception() << "Duplicate configuration setting name " << name.Quote();
         }

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

@@ -12,8 +12,17 @@ namespace NCommon {
 
 const TString ALL_CLUSTERS = "$all";
 
-// TODO: replace RUNTIME/PERCLUSTER with enum
+enum class EConfSettingType {
+    Static,
+    StaticPerCluster,
+    Dynamic,
+};
+
+#ifdef YQL_BETTER_CONF_SETTING_API
+template <typename TType, EConfSettingType SettingType = EConfSettingType::Dynamic>
+#else
 template <typename TType, bool RUNTIME = true, bool PERCLUSTER = false>
+#endif
 class TConfSetting {
 public:
     TConfSetting() = default;
@@ -25,7 +34,11 @@ class TConfSetting {
     ~TConfSetting() = default;
 
     bool IsRuntime() const {
+#ifdef YQL_BETTER_CONF_SETTING_API
+        return SettingType == EConfSettingType::Dynamic;
+#else
         return RUNTIME;
+#endif
     }
 
     TType& operator[](const TString& cluster) {
@@ -81,7 +94,11 @@ class TConfSetting {
 };
 
 template <typename TType>
+#ifdef YQL_BETTER_CONF_SETTING_API
+class TConfSetting<TType, EConfSettingType::Static> {
+#else
 class TConfSetting<TType, false, false> {
+#endif
 public:
     TConfSetting() = default;
     TConfSetting(const TType& value)