Remove core::Config class and its usage (facebookincubator#10756)

Summary: As a config migration effort, remove core::Config class as all dependencies have migrated as of now. Pull Request resolved: facebookincubator#10756 Reviewed By: xiaoxmeng Differential Revision: D61272598 Pulled By: tanjialiang fbshipit-source-id: f94cb05c592dbf2e8e6165d5a7636d3b01a27684
TongWei1105 · Aug 15, 2024 · 4fdc4d4 · 4fdc4d4
1 parent 94763e7
commit 4fdc4d4
Show file tree

Hide file tree

Showing 20 changed files with 13 additions and 316 deletions.
diff --git a/velox/connectors/Connector.h b/velox/connectors/Connector.h
@@ -455,12 +455,6 @@ class ConnectorFactory {
       std::shared_ptr<const config::ConfigBase> config,
       folly::Executor* executor = nullptr) = 0;
 
-  // TODO(jtan6): [Config Refactor] Remove this old API when refactor is done.
-  virtual std::shared_ptr<Connector> newConnector(
-      const std::string& id,
-      std::shared_ptr<const Config> config,
-      folly::Executor* executor = nullptr) = 0;
-
  private:
   const std::string name_;
 };

diff --git a/velox/connectors/fuzzer/FuzzerConnector.h b/velox/connectors/fuzzer/FuzzerConnector.h
@@ -18,7 +18,6 @@
 #include "velox/common/config/Config.h"
 #include "velox/connectors/Connector.h"
 #include "velox/connectors/fuzzer/FuzzerConnectorSplit.h"
-#include "velox/core/Config.h"
 #include "velox/vector/fuzzer/VectorFuzzer.h"
 
 namespace facebook::velox::connector::fuzzer {
@@ -145,17 +144,6 @@ class FuzzerConnectorFactory : public ConnectorFactory {
       folly::Executor* executor = nullptr) override {
     return std::make_shared<FuzzerConnector>(id, config, executor);
   }
-
-  std::shared_ptr<Connector> newConnector(
-      const std::string& id,
-      std::shared_ptr<const Config> config,
-      folly::Executor* executor = nullptr) override {
-    std::shared_ptr<const config::ConfigBase> convertedConfig;
-    convertedConfig = config == nullptr
-        ? nullptr
-        : std::make_shared<config::ConfigBase>(config->valuesCopy());
-    return newConnector(id, convertedConfig, executor);
-  }
 };
 
 } // namespace facebook::velox::connector::fuzzer
diff --git a/velox/connectors/hive/HiveConnector.h b/velox/connectors/hive/HiveConnector.h
@@ -101,17 +101,6 @@ class HiveConnectorFactory : public ConnectorFactory {
       folly::Executor* executor = nullptr) override {
     return std::make_shared<HiveConnector>(id, config, executor);
   }
-
-  std::shared_ptr<Connector> newConnector(
-      const std::string& id,
-      std::shared_ptr<const Config> config,
-      folly::Executor* executor = nullptr) override {
-    std::shared_ptr<const config::ConfigBase> convertedConfig;
-    convertedConfig = config == nullptr
-        ? nullptr
-        : std::make_shared<config::ConfigBase>(config->valuesCopy());
-    return newConnector(id, convertedConfig, executor);
-  }
 };
 
 class HiveHadoop2ConnectorFactory : public HiveConnectorFactory {

diff --git a/velox/connectors/tests/ConnectorTest.cpp b/velox/connectors/tests/ConnectorTest.cpp
@@ -56,13 +56,6 @@ class TestConnectorFactory : public connector::ConnectorFactory {
 
   TestConnectorFactory() : ConnectorFactory(kConnectorFactoryName) {}
 
-  std::shared_ptr<Connector> newConnector(
-      const std::string& id,
-      std::shared_ptr<const Config> /*config*/,
-      folly::Executor* /*executor*/ = nullptr) override {
-    return std::make_shared<TestConnector>(id);
-  }
-
   std::shared_ptr<Connector> newConnector(
       const std::string& id,
       std::shared_ptr<const config::ConfigBase> /*config*/,

diff --git a/velox/connectors/tpch/TpchConnector.h b/velox/connectors/tpch/TpchConnector.h
@@ -18,7 +18,6 @@
 #include "velox/common/config/Config.h"
 #include "velox/connectors/Connector.h"
 #include "velox/connectors/tpch/TpchConnectorSplit.h"
-#include "velox/core/Config.h"
 #include "velox/tpch/gen/TpchGen.h"
 
 namespace facebook::velox::connector::tpch {
@@ -175,17 +174,6 @@ class TpchConnectorFactory : public ConnectorFactory {
       folly::Executor* executor = nullptr) override {
     return std::make_shared<TpchConnector>(id, config, executor);
   }
-
-  std::shared_ptr<Connector> newConnector(
-      const std::string& id,
-      std::shared_ptr<const Config> config,
-      folly::Executor* executor = nullptr) override {
-    std::shared_ptr<const config::ConfigBase> convertedConfig;
-    convertedConfig = config == nullptr
-        ? nullptr
-        : std::make_shared<config::ConfigBase>(config->valuesCopy());
-    return newConnector(id, convertedConfig, executor);
-  }
 };
 
 } // namespace facebook::velox::connector::tpch
diff --git a/velox/core/CMakeLists.txt b/velox/core/CMakeLists.txt
@@ -15,12 +15,6 @@ if(${VELOX_BUILD_TESTING})
   add_subdirectory(tests)
 endif()
 
-velox_add_library(velox_config Config.cpp)
-velox_link_libraries(
-  velox_config
-  PUBLIC velox_exception Folly::folly
-  PRIVATE velox_type_tz)
-
 velox_add_library(
   velox_core
   Expressions.cpp
@@ -34,7 +28,6 @@ velox_link_libraries(
   velox_core
   PUBLIC velox_arrow_bridge
          velox_caching
-         velox_config
          velox_common_config
          velox_connector
          velox_exception

diff --git a/velox/core/Config.cpp b/velox/core/Config.cpp
diff --git a/velox/core/Config.h b/velox/core/Config.h
diff --git a/velox/core/QueryConfig.h b/velox/core/QueryConfig.h
@@ -16,11 +16,10 @@
 #pragma once
 
 #include "velox/common/config/Config.h"
-#include "velox/core/Config.h"
 
 namespace facebook::velox::core {
 
-/// A simple wrapper around velox::Config. Defines constants for query
+/// A simple wrapper around velox::ConfigBase. Defines constants for query
 /// config properties and accessor methods.
 /// Create per query context. Does not have a singleton instance.
 /// Does not allow altering properties on the fly. Only at creation time.

diff --git a/velox/core/QueryCtx.cpp b/velox/core/QueryCtx.cpp
@@ -17,7 +17,6 @@
 #include "velox/core/QueryCtx.h"
 #include "velox/common/base/SpillConfig.h"
 #include "velox/common/config/Config.h"
-#include "velox/core/Config.h"
 
 namespace facebook::velox::core {
 
@@ -43,34 +42,6 @@ std::shared_ptr<QueryCtx> QueryCtx::create(
   return queryCtx;
 }
 
-// static
-std::shared_ptr<QueryCtx> QueryCtx::create(
-    folly::Executor* executor,
-    QueryConfig&& queryConfig,
-    std::unordered_map<std::string, std::shared_ptr<Config>> connectorConfigs,
-    cache::AsyncDataCache* cache,
-    std::shared_ptr<memory::MemoryPool> pool,
-    folly::Executor* spillExecutor,
-    const std::string& queryId) {
-  std::unordered_map<std::string, std::shared_ptr<config::ConfigBase>>
-      convertedConfigs;
-  for (const auto& pair : connectorConfigs) {
-    convertedConfigs.insert(
-        {pair.first,
-         std::make_shared<config::ConfigBase>(pair.second->valuesCopy())});
-  }
-  std::shared_ptr<QueryCtx> queryCtx(new QueryCtx(
-      executor,
-      std::move(queryConfig),
-      std::move(convertedConfigs),
-      cache,
-      std::move(pool),
-      spillExecutor,
-      queryId));
-  queryCtx->maybeSetReclaimer();
-  return queryCtx;
-}
-
 QueryCtx::QueryCtx(
     folly::Executor* executor,
     QueryConfig&& queryConfig,

diff --git a/velox/core/QueryCtx.h b/velox/core/QueryCtx.h
@@ -53,17 +53,6 @@ class QueryCtx : public std::enable_shared_from_this<QueryCtx> {
       folly::Executor* spillExecutor = nullptr,
       const std::string& queryId = "");
 
-  // TODO(jtan6): [Config Refactor] Remove this old API after refactoring is
-  //  done.
-  static std::shared_ptr<QueryCtx> create(
-      folly::Executor* executor,
-      QueryConfig&& queryConfig,
-      std::unordered_map<std::string, std::shared_ptr<Config>> connectorConfigs,
-      cache::AsyncDataCache* cache = cache::AsyncDataCache::getInstance(),
-      std::shared_ptr<memory::MemoryPool> pool = nullptr,
-      folly::Executor* spillExecutor = nullptr,
-      const std::string& queryId = "");
-
   static std::string generatePoolName(const std::string& queryId);
 
   memory::MemoryPool* pool() const {