Remove unused Operator::memoryPool (facebookincubator#294)

Summary: Pull Request resolved: facebookincubator#294 Reviewed By: amitkdutta Differential Revision: D31170377 Pulled By: mbasmanova fbshipit-source-id: 0f67789fe7ed05ebf8573a6eea5782c60013cc16
zzhao0 · Sep 24, 2021 · 10de4e4 · 10de4e4
1 parent 79c395d
commit 10de4e4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 22 deletions.
diff --git a/velox/exec/Driver.h b/velox/exec/Driver.h
@@ -82,22 +82,11 @@ struct DriverCtx {
       int _pipelineId,
       int32_t numDrivers);
 
-  velox::memory::MemoryPool* FOLLY_NONNULL addOperatorUserPool() {
+  velox::memory::MemoryPool* FOLLY_NONNULL addOperatorPool() {
     opMemPools_.push_back(execCtx->pool()->addScopedChild("operator_ctx"));
     return opMemPools_.back().get();
   }
 
-  velox::memory::MemoryPool* FOLLY_NONNULL
-  addOperatorSystemPool(velox::memory::MemoryPool* FOLLY_NONNULL userPool) {
-    auto poolPtr = userPool->addScopedChild("operator_ctx");
-    poolPtr->setMemoryUsageTracker(
-        userPool->getMemoryUsageTracker()->addChild(true));
-    auto pool = poolPtr.get();
-    opMemPools_.push_back(std::move(poolPtr));
-
-    return pool;
-  }
-
   std::unique_ptr<connector::ConnectorQueryCtx> createConnectorQueryCtx(
       const std::string& connectorId) const;
 

diff --git a/velox/exec/Operator.h b/velox/exec/Operator.h
@@ -154,19 +154,12 @@ struct OperatorStats {
 class OperatorCtx {
  public:
   explicit OperatorCtx(DriverCtx* driverCtx)
-      : driverCtx_(driverCtx), pool_(driverCtx_->addOperatorUserPool()) {}
+      : driverCtx_(driverCtx), pool_(driverCtx_->addOperatorPool()) {}
 
   velox::memory::MemoryPool* pool() const {
     return pool_;
   }
 
-  velox::memory::MemoryPool* systemPool() const {
-    if (!systemMemPool_) {
-      systemMemPool_ = driverCtx_->addOperatorSystemPool(pool_);
-    }
-    return systemMemPool_;
-  }
-
   memory::MappedMemory* mappedMemory() const;
 
   const std::shared_ptr<Task>& task() const {
@@ -196,9 +189,7 @@ class OperatorCtx {
   velox::memory::MemoryPool* pool_;
 
   // These members are created on demand.
-  mutable velox::memory::MemoryPool* systemMemPool_{nullptr};
   mutable std::shared_ptr<memory::MappedMemory> mappedMemory_;
-  mutable std::shared_ptr<memory::MappedMemory> recoverableMappedMemory_;
 };
 
 // Query operator