Refactored TTopicFiltersSet -> TTopicFilters

Author: GrigoriyPA

ydb/core/fq/libs/row_dispatcher/format_handler/filters/filters_set.cpp

@@ -6,7 +6,7 @@ namespace NFq::NRowDispatcher {
 
 namespace {
 
-class TTopicFiltersSet : public ITopicFiltersSet {
+class TTopicFilters : public ITopicFilters {
     struct TCounters {
         const NMonitoring::TDynamicCounterPtr Counters;
 
@@ -42,7 +42,7 @@ class TTopicFiltersSet : public ITopicFiltersSet {
 
     class TFilterHandler {
     public:
-        TFilterHandler(TTopicFiltersSet& self, IFilteredDataConsumer::TPtr consumer, IPurecalcFilter::TPtr purecalcFilter)
+        TFilterHandler(TTopicFilters& self, IFilteredDataConsumer::TPtr consumer, IPurecalcFilter::TPtr purecalcFilter)
             : Self(self)
             , Consumer(std::move(consumer))
             , PurecalcFilter(std::move(purecalcFilter))
@@ -117,7 +117,7 @@ class TTopicFiltersSet : public ITopicFiltersSet {
         }
 
     private:
-        TTopicFiltersSet& Self;
+        TTopicFilters& Self;
         const IFilteredDataConsumer::TPtr Consumer;
         const IPurecalcFilter::TPtr PurecalcFilter;
         const TString LogPrefix;
@@ -127,14 +127,14 @@ class TTopicFiltersSet : public ITopicFiltersSet {
     };
 
 public:
-    explicit TTopicFiltersSet(NActors::TActorId owner, const TTopicFiltersSetConfig& config, NMonitoring::TDynamicCounterPtr counters)
+    explicit TTopicFilters(NActors::TActorId owner, const TTopicFiltersConfig& config, NMonitoring::TDynamicCounterPtr counters)
         : Config(config)
         , Owner(owner)
-        , LogPrefix("TTopicFiltersSet: ")
+        , LogPrefix("TTopicFilters: ")
         , Counters(counters)
     {}
 
-    ~TTopicFiltersSet() {
+    ~TTopicFilters() {
         Filters.clear();
     }
 
@@ -251,7 +251,7 @@ class TTopicFiltersSet : public ITopicFiltersSet {
     }
 
 private:
-    const TTopicFiltersSetConfig Config;
+    const TTopicFiltersConfig Config;
     const NActors::TActorId Owner;
     const TString LogPrefix;
 
@@ -266,8 +266,8 @@ class TTopicFiltersSet : public ITopicFiltersSet {
 
 }  // anonymous namespace
 
-ITopicFiltersSet::TPtr CreateTopicFiltersSet(NActors::TActorId owner, const TTopicFiltersSetConfig& config, NMonitoring::TDynamicCounterPtr counters) {
-    return MakeIntrusive<TTopicFiltersSet>(owner, config, counters);
+ITopicFilters::TPtr CreateTopicFilters(NActors::TActorId owner, const TTopicFiltersConfig& config, NMonitoring::TDynamicCounterPtr counters) {
+    return MakeIntrusive<TTopicFilters>(owner, config, counters);
 }
 
 }  // namespace NFq::NRowDispatcher

ydb/core/fq/libs/row_dispatcher/format_handler/filters/filters_set.h

@@ -21,9 +21,9 @@ class IFilteredDataConsumer : public IPurecalcFilterConsumer {
     virtual void OnFilteringError(TStatus status) = 0;
 };
 
-class ITopicFiltersSet : public TThrRefBase, public TNonCopyable {
+class ITopicFilters : public TThrRefBase, public TNonCopyable {
 public:
-    using TPtr = TIntrusivePtr<ITopicFiltersSet>;
+    using TPtr = TIntrusivePtr<ITopicFilters>;
 
 public:
     // columnIndex - mapping from stable column id to index in values array
@@ -36,10 +36,10 @@ class ITopicFiltersSet : public TThrRefBase, public TNonCopyable {
     virtual TFiltersStatistic GetStatistics() = 0;
 };
 
-struct TTopicFiltersSetConfig {
+struct TTopicFiltersConfig {
     NActors::TActorId CompileServiceId;
 };
 
-ITopicFiltersSet::TPtr CreateTopicFiltersSet(NActors::TActorId owner, const TTopicFiltersSetConfig& config, NMonitoring::TDynamicCounterPtr counters);
+ITopicFilters::TPtr CreateTopicFilters(NActors::TActorId owner, const TTopicFiltersConfig& config, NMonitoring::TDynamicCounterPtr counters);
 
 }  // namespace NFq::NRowDispatcher

ydb/core/fq/libs/row_dispatcher/format_handler/format_handler.cpp

@@ -498,7 +498,7 @@ class TTopicFormatHandler : public NActors::TActor<TTopicFormatHandler>, public
 
     void CreateFilters() {
         if (!Filters) {
-            Filters = CreateTopicFiltersSet(SelfId(), Config.FiltersConfig, Counters.CountersSubgroup);
+            Filters = CreateTopicFilters(SelfId(), Config.FiltersConfig, Counters.CountersSubgroup);
         }
     }
 
@@ -544,7 +544,7 @@ class TTopicFormatHandler : public NActors::TActor<TTopicFormatHandler>, public
     // Perser and filters
     ITopicParser::TPtr Parser;
     TParserHandler::TPtr ParserHandler;
-    ITopicFiltersSet::TPtr Filters;
+    ITopicFilters::TPtr Filters;
 
     // Parsed data
     const TVector<ui64>* Offsets;

ydb/core/fq/libs/row_dispatcher/format_handler/format_handler.h

@@ -63,7 +63,7 @@ class ITopicFormatHandler : public TNonCopyable {
 // Static properties for all format handlers
 struct TFormatHandlerConfig {
     TJsonParserConfig JsonParserConfig;
-    TTopicFiltersSetConfig FiltersConfig;
+    TTopicFiltersConfig FiltersConfig;
 };
 
 ITopicFormatHandler::TPtr CreateTopicFormatHandler(const NActors::TActorContext& owner, const TFormatHandlerConfig& config, const ITopicFormatHandler::TSettings& settings, NMonitoring::TDynamicCounterPtr counters);

ydb/core/fq/libs/row_dispatcher/format_handler/ut/topic_filter_ut.cpp

@@ -204,7 +204,7 @@ class TFilterSetFixture : public TFiterFixture {
         TBase::SetUp(ctx);
 
         CompileNotifier = Runtime.AllocateEdgeActor();
-        FiltersSet = CreateTopicFiltersSet(CompileNotifier, {.CompileServiceId = CompileServiceActorId}, MakeIntrusive<NMonitoring::TDynamicCounters>());
+        FiltersSet = CreateTopicFilters(CompileNotifier, {.CompileServiceId = CompileServiceActorId}, MakeIntrusive<NMonitoring::TDynamicCounters>());
     }
 
     void TearDown(NUnitTest::TTestContext& ctx) override {
@@ -253,7 +253,7 @@ class TFilterSetFixture : public TFiterFixture {
     std::unordered_map<TString, ui64> ColumnIndex;
 
     NActors::TActorId CompileNotifier;
-    ITopicFiltersSet::TPtr FiltersSet;
+    ITopicFilters::TPtr FiltersSet;
 };
 
 }  // anonymous namespace