Fix formatting

arangodb · knakatasf · Jul 16, 2025 · Jul 25, 2025 · Jul 29, 2025 · Aug 1, 2025
commit e96c332a8f7452b60e9e7173fbc49a43f115d37d
diff --git a/arangod/Aql/Aggregator.h b/arangod/Aql/Aggregator.h
@@ -48,8 +48,13 @@ struct Aggregator {
     virtual ~Factory() = default;
     // virtual std::unique_ptr<Aggregator> operator()(
     //     velocypack::Options const*) const = 0;
+<<<<<<< HEAD
     virtual std::unique_ptr<Aggregator> operator()(velocypack::Options const*,
                                                    ResourceMonitor&) const = 0;
+=======
+    virtual std::unique_ptr<Aggregator> operator()(velocypack::Options const*,
+                                                   ResourceMonitor&) const = 0;
+>>>>>>> 05a72dd9d8d (chore: Refactor Aggregator instantiation so it takes ResourceMonitor& instead of ResourceUsageScope&)
     virtual void createInPlace(void*, velocypack::Options const*,
                                ResourceMonitor&) const = 0;
     virtual std::size_t getAggregatorSize() const = 0;
@@ -76,10 +81,6 @@ struct Aggregator {
                                                     std::string_view type,
                                                     ResourceMonitor& monitor);
 
-  // static std::unique_ptr<Aggregator> fromTypeString(velocypack::Options
-  // const*,
-  //                                                 std::string_view type);
-
   /// @brief creates an aggregator from a velocypack slice
   static std::unique_ptr<Aggregator> fromVPack(velocypack::Options const*,
                                                arangodb::velocypack::Slice,

diff --git a/arangod/Aql/Executor/HashedCollectExecutor.h b/arangod/Aql/Executor/HashedCollectExecutor.h
@@ -195,7 +195,11 @@ class HashedCollectExecutor {
  private:
   struct ValueAggregators {
     ValueAggregators(std::vector<Aggregator::Factory const*> factories,
+<<<<<<< HEAD
                      velocypack::Options const* opts, ResourceMonitor& monitor);
+=======
+                     velocypack::Options const* opts, ResourceMonitor& monitor);
+>>>>>>> 05a72dd9d8d (chore: Refactor Aggregator instantiation so it takes ResourceMonitor& instead of ResourceUsageScope&)
     ~ValueAggregators();
     std::size_t size() const;
     Aggregator& operator[](std::size_t index);

diff --git a/arangod/Aql/Executor/IndexAggregateScanExecutor.cpp b/arangod/Aql/Executor/IndexAggregateScanExecutor.cpp
@@ -292,8 +292,13 @@ IndexAggregateScanExecutor::IndexAggregateScanExecutor(Fetcher& fetcher,
     _aggregatorInstances.reserve(_infos.aggregations.size());
     for (auto const& agg : _infos.aggregations) {
       auto const& factory = Aggregator::factoryFromTypeString(agg.type);
+<<<<<<< HEAD
       auto instance = factory.operator()(&_infos.query->vpackOptions(),
                                          *infos.resourceMonitor);
+=======
+      auto instance = factory.operator()(&_infos.query->vpackOptions(),
+                                         *infos.resourceMonitor);
+>>>>>>> 05a72dd9d8d (chore: Refactor Aggregator instantiation so it takes ResourceMonitor& instead of ResourceUsageScope&)
 
       _aggregatorInstances.emplace_back(std::move(instance))->reset();
     }