Use ConfigBuilder where possible

Author: kurapov-peter

omniscidb/Tests/ArrayTest.cpp

@@ -15,6 +15,7 @@
  */
 
 #include "ArrowSQLRunner/ArrowSQLRunner.h"
+#include "ConfigBuilder/ConfigBuilder.h"
 #include "TestHelpers.h"
 
 #include <string>
@@ -925,26 +926,13 @@ TEST_F(MultiFragArrayParallelLinearizationTest, IndexedArrayJoin) {
 }
 
 int main(int argc, char** argv) {
-  auto config = std::make_shared<Config>();
   g_is_test_env = true;
 
   TestHelpers::init_logger_stderr_only(argc, argv);
   testing::InitGoogleTest(&argc, argv);
-  namespace po = boost::program_options;
-
-  po::options_description desc("Options");
-
-  logger::LogOptions log_options(argv[0]);
-  log_options.max_files_ = 0;  // stderr only by default
-  desc.add(log_options.get_options());
-  desc.add_options()("cpu-only",
-                     po::value<bool>(&config->exec.cpu_only)
-                         ->default_value(config->exec.cpu_only)
-                         ->implicit_value(true));
-
-  po::variables_map vm;
-  po::store(po::command_line_parser(argc, argv).options(desc).run(), vm);
-  po::notify(vm);
+  ConfigBuilder builder;
+  builder.parseCommandLineArgs(argc, argv, true);
+  auto config = builder.config();
 
   config->exec.heterogeneous.allow_cpu_retry = true;
   config->exec.heterogeneous.allow_query_step_cpu_retry = true;

omniscidb/Tests/CMakeLists.txt

@@ -83,7 +83,7 @@ if (ENABLE_DWARF_BENCH)
   target_link_libraries(DwarfBenchIntegrationTest gtest CostModel)
 endif()
 
-target_link_libraries(ResultSetTest gtest QueryEngine ArrowQueryRunner ArrowStorage)
+target_link_libraries(ResultSetTest gtest QueryEngine ArrowQueryRunner ArrowStorage ConfigBuilder)
 target_link_libraries(ColumnarResultsTest gtest QueryEngine)
 target_link_libraries(FromTableReorderingTest gtest QueryEngine)
 target_link_libraries(ResultSetBaselineRadixSortTest gtest QueryEngine)
@@ -93,9 +93,9 @@ target_link_libraries(StringFunctionsTest gtest QueryEngine ArrowQueryRunner)
 target_link_libraries(CodeGeneratorTest gtest QueryEngine)
 target_link_libraries(ArrowBasedExecuteTest gtest QueryEngine ArrowQueryRunner)
 target_link_libraries(StandaloneQueryRunner gtest QueryEngine ArrowQueryRunner)
-target_link_libraries(ArrayTest gtest QueryEngine ArrowQueryRunner)
-target_link_libraries(GroupByTest gtest QueryEngine ArrowQueryRunner)
-target_link_libraries(TopKTest gtest ArrowQueryRunner ArrowStorage Logger)
+target_link_libraries(ArrayTest gtest QueryEngine ArrowQueryRunner ConfigBuilder)
+target_link_libraries(GroupByTest gtest QueryEngine ArrowQueryRunner ConfigBuilder)
+target_link_libraries(TopKTest gtest ArrowQueryRunner ArrowStorage Logger ConfigBuilder)
 
 if(ENABLE_FOLLY) 
   target_link_libraries(StringDictionaryTest gtest StringDictionary Logger Utils $<$<AND:$<CXX_COMPILER_ID:GNU>,$<VERSION_LESS:$<CXX_COMPILER_VERSION>,9.0>>:stdc++fs> ${CMAKE_DL_LIBS} ${Folly_LIBRARIES} ${Boost_LIBRARIES} ${ZLIB_LIBRARIES})
@@ -112,13 +112,13 @@ target_link_libraries(EncoderTest gtest ${Arrow_LIBRARIES} DataMgr Logger)
 if(NOT MSVC)
 	target_link_libraries(QuantileCpuTest gtest Logger TBB::tbb)
 endif()
-target_link_libraries(DataRecyclerTest gtest QueryEngine ArrowQueryRunner)
+target_link_libraries(DataRecyclerTest gtest QueryEngine ArrowQueryRunner ConfigBuilder)
 target_link_libraries(NoCatalogRelAlgTest gtest QueryEngine)
 target_link_libraries(NoCatalogSqlTest gtest QueryEngine Calcite)
 target_link_libraries(ArrowStorageTest gtest QueryEngine ArrowStorage)
 target_link_libraries(ArrowStorageSqlTest gtest QueryEngine ArrowQueryRunner ArrowStorage)
 target_link_libraries(ParallelSortTest gtest TBB::tbb Logger)
-target_link_libraries(ResultSetArrowConversion gtest QueryEngine ArrowQueryRunner ArrowStorage)
+target_link_libraries(ResultSetArrowConversion gtest QueryEngine ArrowQueryRunner ArrowStorage ConfigBuilder)
 target_link_libraries(ExecutionSequenceTest gtest QueryEngine ArrowQueryRunner ArrowStorage ConfigBuilder)
 target_link_libraries(QueryBuilderTest gtest QueryBuilder QueryEngine ArrowQueryRunner IR ArrowStorage ConfigBuilder)
 

omniscidb/Tests/CachedHashTableTest.cpp

@@ -17,6 +17,7 @@
 #include "ArrowSQLRunner/ArrowSQLRunner.h"
 #include "TestHelpers.h"
 
+#include "ConfigBuilder/ConfigBuilder.h"
 #include "Logger/Logger.h"
 #include "QueryEngine/DataRecycler/HashtableRecycler.h"
 #include "QueryEngine/Execute.h"
@@ -664,8 +665,11 @@ TEST(Delete, JoinCacheInvalidationTest_DropTable) {
 int main(int argc, char** argv) {
   TestHelpers::init_logger_stderr_only(argc, argv);
   testing::InitGoogleTest(&argc, argv);
+  ConfigBuilder builder;
+  builder.parseCommandLineArgs(argc, argv, true);
+  auto config = builder.config();
 
-  init();
+  init(config);
 
   int err{0};
 

omniscidb/Tests/DataRecyclerTest.cpp

@@ -18,6 +18,7 @@
 #include "InExprDetector.h"
 #include "TestHelpers.h"
 
+#include "ConfigBuilder/ConfigBuilder.h"
 #include "DataMgr/DataMgrBufferProvider.h"
 #include "Logger/Logger.h"
 #include "QueryEngine/CompilationOptions.h"
@@ -1207,8 +1208,9 @@ TEST(DataRecycler, DISABLED_Hashtable_For_Dict_Encoded_Column) {
 int main(int argc, char* argv[]) {
   testing::InitGoogleTest(&argc, argv);
   TestHelpers::init_logger_stderr_only(argc, argv);
-
-  auto config = std::make_shared<Config>();
+  ConfigBuilder builder;
+  builder.parseCommandLineArgs(argc, argv, true);
+  auto config = builder.config();
 
   init(config);
   PerfectJoinHashTable::initCaches(config);

omniscidb/Tests/GroupByTest.cpp

@@ -17,6 +17,7 @@
 #include "TestHelpers.h"
 
 #include "ArrowSQLRunner/ArrowSQLRunner.h"
+#include "ConfigBuilder/ConfigBuilder.h"
 #include "DataMgr/DataMgrBufferProvider.h"
 #include "DataMgr/DataMgrDataProvider.h"
 #include "QueryEngine/CardinalityEstimator.h"
@@ -368,26 +369,13 @@ TEST_F(BigCardinalityThresholdTest, EmptyFilters) {
 }
 
 int main(int argc, char** argv) {
-  auto config = std::make_shared<Config>();
   g_is_test_env = true;
 
   TestHelpers::init_logger_stderr_only(argc, argv);
   testing::InitGoogleTest(&argc, argv);
-  namespace po = boost::program_options;
-
-  po::options_description desc("Options");
-
-  logger::LogOptions log_options(argv[0]);
-  log_options.max_files_ = 0;  // stderr only by default
-  desc.add(log_options.get_options());
-  desc.add_options()("cpu-only",
-                     po::value<bool>(&config->exec.cpu_only)
-                         ->default_value(config->exec.cpu_only)
-                         ->implicit_value(true));
-
-  po::variables_map vm;
-  po::store(po::command_line_parser(argc, argv).options(desc).run(), vm);
-  po::notify(vm);
+  ConfigBuilder builder;
+  builder.parseCommandLineArgs(argc, argv, true);
+  auto config = builder.config();
 
   config->exec.heterogeneous.allow_cpu_retry = false;
   config->exec.heterogeneous.allow_query_step_cpu_retry = false;

omniscidb/Tests/JoinHashTableTest.cpp

@@ -17,6 +17,7 @@
 #include "ArrowSQLRunner/ArrowSQLRunner.h"
 #include "TestHelpers.h"
 
+#include "ConfigBuilder/ConfigBuilder.h"
 #include "DataMgr/DataMgr.h"
 #include "DataMgr/DataMgrBufferProvider.h"
 #include "DataMgr/DataMgrDataProvider.h"
@@ -672,8 +673,9 @@ TEST(Other, Regression) {
 int main(int argc, char** argv) {
   TestHelpers::init_logger_stderr_only(argc, argv);
   testing::InitGoogleTest(&argc, argv);
-
-  auto config = std::make_shared<Config>();
+  ConfigBuilder builder;
+  builder.parseCommandLineArgs(argc, argv, true);
+  auto config = builder.config();
 
   init(config);
   PerfectJoinHashTable::initCaches(config);

omniscidb/Tests/ResultSetArrowConversion.cpp

@@ -17,6 +17,7 @@
 #include "ArrowSQLRunner/ArrowSQLRunner.h"
 #include "ArrowTestHelpers.h"
 
+#include "ConfigBuilder/ConfigBuilder.h"
 #include "ResultSet/ArrowResultSet.h"
 #include "Shared/ArrowUtil.h"
 #include "Shared/InlineNullValues.h"
@@ -951,15 +952,15 @@ TEST(ArrowTable, FixedLenArrays) {
 
 int main(int argc, char* argv[]) {
   testing::InitGoogleTest(&argc, argv);
+  TestHelpers::init_logger_stderr_only(argc, argv);
+  ConfigBuilder builder;
+  builder.parseCommandLineArgs(argc, argv, true);
+  auto config = builder.config();
+
+  init(config);
 
   int err{0};
   try {
-    auto config = std::make_shared<Config>();
-
-    parse_cli_args(argc, argv, config);
-
-    init(config);
-
     import_data();
 
     err = RUN_ALL_TESTS();

omniscidb/Tests/ResultSetTest.cpp

@@ -22,6 +22,7 @@
  */
 
 #include "ArrowSQLRunner/ArrowSQLRunner.h"
+#include "ConfigBuilder/ConfigBuilder.h"
 #include "ResultSetTestUtils.h"
 #include "Shared/scope.h"
 #include "TestHelpers.h"
@@ -3102,33 +3103,14 @@ TEST(Util, PairToDouble) {
 }
 
 int main(int argc, char** argv) {
-  auto config = std::make_shared<Config>();
   g_is_test_env = true;
 
   testing::InitGoogleTest(&argc, argv);
-  namespace po = boost::program_options;
+  TestHelpers::init_logger_stderr_only(argc, argv);
+  ConfigBuilder builder;
+  builder.parseCommandLineArgs(argc, argv, true);
+  auto config = builder.config();
 
-  po::options_description desc("Options");
-
-  // these two are here to allow passing correctly google testing parameters
-  desc.add_options()("gtest_list_tests", "list all test");
-  desc.add_options()("gtest_filter", "filters tests, use --help for details");
-
-  desc.add_options()("cpu-only",
-                     po::value<bool>(&config->exec.cpu_only)
-                         ->default_value(config->exec.cpu_only)
-                         ->implicit_value(true));
-
-  logger::LogOptions log_options(argv[0]);
-  log_options.severity_ = logger::Severity::FATAL;
-  log_options.set_options();  // update default values
-  desc.add(log_options.get_options());
-
-  po::variables_map vm;
-  po::store(po::command_line_parser(argc, argv).options(desc).run(), vm);
-  po::notify(vm);
-
-  logger::init(log_options);
   config->exec.heterogeneous.allow_cpu_retry = false;
   config->exec.heterogeneous.allow_query_step_cpu_retry = false;
   init(config);

omniscidb/Tests/TopKTest.cpp

@@ -16,6 +16,7 @@
  */
 
 #include "ArrowSQLRunner/ArrowSQLRunner.h"
+#include "ConfigBuilder/ConfigBuilder.h"
 #include "TestHelpers.h"
 
 #include <gtest/gtest.h>
@@ -426,8 +427,11 @@ TEST(Select, DISABLED_TopK_LIMIT_OFFSET_DifferentOrders) {
 int main(int argc, char* argv[]) {
   TestHelpers::init_logger_stderr_only(argc, argv);
   ::testing::InitGoogleTest(&argc, argv);
+  ConfigBuilder builder;
+  builder.parseCommandLineArgs(argc, argv, true);
+  auto config = builder.config();
 
-  init();
+  init(config);
 
   int err{0};
 

omniscidb/Tests/UdfTest.cpp

@@ -58,7 +58,6 @@ std::string get_udf_ast_filename() {
   return udf_file_name_base + ".ast";
 }
 
-
 CudaMgr_Namespace::NvidiaDeviceArch init_nvidia_device_arch() {
 #ifdef HAVE_CUDA
   auto cuda_mgr = std::make_unique<CudaMgr_Namespace::CudaMgr>(/*num_gpus=*/0);