From 8de0471359688e21eb188e1b703dd6612aa3d380 Mon Sep 17 00:00:00 2001 From: zhejiangxiaomai Date: Wed, 7 Sep 2022 16:40:37 +0800 Subject: [PATCH] [OPPRO-234] Upgrade velox to 9.1 version (#356) --- cpp/velox/CMakeLists.txt | 3 ++- cpp/velox/compute/VeloxPlanConverter.cc | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cpp/velox/CMakeLists.txt b/cpp/velox/CMakeLists.txt index 5a251c663c37..a8e3f42e9d95 100644 --- a/cpp/velox/CMakeLists.txt +++ b/cpp/velox/CMakeLists.txt @@ -74,7 +74,7 @@ macro(ADD_VELOX_DEPENDENCIES) add_velox_dependency(functions::prestosql "${VELOX_COMPONENTS_PATH}/functions/prestosql/registration/libvelox_functions_prestosql.a") add_velox_dependency(functions::prestosql::impl "${VELOX_COMPONENTS_PATH}/functions/prestosql/libvelox_functions_prestosql_impl.a") add_velox_dependency(functions::json "${VELOX_COMPONENTS_PATH}/functions/prestosql/json/libvelox_functions_json.a") - add_velox_dependency(functions::hyperloglog "${VELOX_COMPONENTS_PATH}/functions/prestosql/hyperloglog/libvelox_functions_hyperloglog.a") + add_velox_dependency(functions::hyperloglog "${VELOX_COMPONENTS_PATH}/common/hyperloglog/libvelox_common_hyperloglog.a") add_velox_dependency(functions::lib "${VELOX_COMPONENTS_PATH}/functions/lib/libvelox_functions_lib.a") add_velox_dependency(exec::test::util "${VELOX_COMPONENTS_PATH}/exec/tests/utils/libvelox_exec_test_util.a") add_velox_dependency(parse::parser "${VELOX_COMPONENTS_PATH}/parse/libvelox_parse_parser.a") @@ -128,6 +128,7 @@ macro(ADD_VELOX_DEPENDENCIES) add_velox_dependency(common::time "${VELOX_COMPONENTS_PATH}/common/time/libvelox_time.a") add_velox_dependency(common::file "${VELOX_COMPONENTS_PATH}/common/file/libvelox_file.a") add_velox_dependency(common::process "${VELOX_COMPONENTS_PATH}/common/process/libvelox_process.a") + add_velox_dependency(common::testutil "${VELOX_COMPONENTS_PATH}/common/testutil/libvelox_test_util.a") add_velox_dependency(external::md5 "${VELOX_COMPONENTS_PATH}/external/md5/libmd5.a") add_velox_dependency(external::date "${VELOX_COMPONENTS_PATH}/external/date/libvelox_external_date.a") diff --git a/cpp/velox/compute/VeloxPlanConverter.cc b/cpp/velox/compute/VeloxPlanConverter.cc index 8d0d4926633b..c4ac2af3079f 100644 --- a/cpp/velox/compute/VeloxPlanConverter.cc +++ b/cpp/velox/compute/VeloxPlanConverter.cc @@ -86,8 +86,8 @@ void VeloxInitializer::Init() { connector::hive::HiveConnectorFactory::kHiveConnectorName) ->newConnector(kHiveConnectorId, nullptr); registerConnector(hiveConnector); - // parquet::registerParquetReaderFactory(ParquetReaderType::NATIVE); - parquet::registerParquetReaderFactory(ParquetReaderType::DUCKDB); + parquet::registerParquetReaderFactory(ParquetReaderType::NATIVE); + // parquet::registerParquetReaderFactory(ParquetReaderType::DUCKDB); dwrf::registerDwrfReaderFactory(); // Register Velox functions functions::prestosql::registerAllScalarFunctions();