From 4c58d529a1b83db29d5e3f335413c135736c75c1 Mon Sep 17 00:00:00 2001 From: Gluten Performance Bot <137994563+GlutenPerfBot@users.noreply.github.com> Date: Fri, 8 Mar 2024 14:09:58 +0800 Subject: [PATCH] [VL] Daily Update Velox Version (2024_03_07) (#4877) Co-authored-by: PHILO-HE --- cpp/velox/benchmarks/ColumnarToRowBenchmark.cc | 3 +-- cpp/velox/benchmarks/ParquetWriteBenchmark.cc | 3 +-- cpp/velox/benchmarks/common/BenchmarkUtils.h | 5 +---- cpp/velox/compute/WholeStageResultIterator.cc | 2 -- cpp/velox/memory/VeloxColumnarBatch.cc | 3 +-- cpp/velox/utils/VeloxArrowUtils.cc | 3 +-- ep/build-velox/src/get_velox.sh | 2 +- 7 files changed, 6 insertions(+), 15 deletions(-) diff --git a/cpp/velox/benchmarks/ColumnarToRowBenchmark.cc b/cpp/velox/benchmarks/ColumnarToRowBenchmark.cc index 2f2ff2ce16718..16b3b6e0b35d6 100644 --- a/cpp/velox/benchmarks/ColumnarToRowBenchmark.cc +++ b/cpp/velox/benchmarks/ColumnarToRowBenchmark.cc @@ -96,8 +96,7 @@ class GoogleBenchmarkColumnarToRow { ArrowArray arrowArray; ArrowSchema arrowSchema; ASSERT_NOT_OK(arrow::ExportRecordBatch(rb, &arrowArray, &arrowSchema)); - return velox::importFromArrowAsOwner( - arrowSchema, arrowArray, ArrowUtils::getBridgeOptions(), gluten::defaultLeafVeloxMemoryPool().get()); + return velox::importFromArrowAsOwner(arrowSchema, arrowArray, gluten::defaultLeafVeloxMemoryPool().get()); } protected: diff --git a/cpp/velox/benchmarks/ParquetWriteBenchmark.cc b/cpp/velox/benchmarks/ParquetWriteBenchmark.cc index 7958765fa644f..d9b2cf77aaef4 100644 --- a/cpp/velox/benchmarks/ParquetWriteBenchmark.cc +++ b/cpp/velox/benchmarks/ParquetWriteBenchmark.cc @@ -102,8 +102,7 @@ class GoogleBenchmarkParquetWrite { ArrowArray arrowArray; ArrowSchema arrowSchema; ASSERT_NOT_OK(arrow::ExportRecordBatch(rb, &arrowArray, &arrowSchema)); - auto vp = velox::importFromArrowAsOwner( - arrowSchema, arrowArray, gluten::ArrowUtils::getBridgeOptions(), gluten::defaultLeafVeloxMemoryPool().get()); + auto vp = velox::importFromArrowAsOwner(arrowSchema, arrowArray, gluten::defaultLeafVeloxMemoryPool().get()); return std::make_shared(std::dynamic_pointer_cast(vp)); } diff --git a/cpp/velox/benchmarks/common/BenchmarkUtils.h b/cpp/velox/benchmarks/common/BenchmarkUtils.h index 0bd09b9478749..f06f5bbd50591 100644 --- a/cpp/velox/benchmarks/common/BenchmarkUtils.h +++ b/cpp/velox/benchmarks/common/BenchmarkUtils.h @@ -88,10 +88,7 @@ void abortIfFileNotExists(const std::string& filepath); inline std::shared_ptr convertBatch(std::shared_ptr cb) { if (cb->getType() != "velox") { auto vp = facebook::velox::importFromArrowAsOwner( - *cb->exportArrowSchema(), - *cb->exportArrowArray(), - gluten::ArrowUtils::getBridgeOptions(), - gluten::defaultLeafVeloxMemoryPool().get()); + *cb->exportArrowSchema(), *cb->exportArrowArray(), gluten::defaultLeafVeloxMemoryPool().get()); return std::make_shared(std::dynamic_pointer_cast(vp)); } else { return cb; diff --git a/cpp/velox/compute/WholeStageResultIterator.cc b/cpp/velox/compute/WholeStageResultIterator.cc index 214d3cab94a57..b74b8504d9438 100644 --- a/cpp/velox/compute/WholeStageResultIterator.cc +++ b/cpp/velox/compute/WholeStageResultIterator.cc @@ -506,8 +506,6 @@ std::unordered_map WholeStageResultIterator::getQueryC configs[velox::core::QueryConfig::kMaxSplitPreloadPerDriver] = std::to_string(veloxCfg_->get(kVeloxSplitPreloadPerDriver, 2)); - configs[velox::core::QueryConfig::kArrowBridgeTimestampUnit] = "6"; - // Disable driver cpu time slicing. configs[velox::core::QueryConfig::kDriverCpuTimeSliceLimitMs] = "0"; diff --git a/cpp/velox/memory/VeloxColumnarBatch.cc b/cpp/velox/memory/VeloxColumnarBatch.cc index f55bb1845e6b7..da004340cd87a 100644 --- a/cpp/velox/memory/VeloxColumnarBatch.cc +++ b/cpp/velox/memory/VeloxColumnarBatch.cc @@ -118,8 +118,7 @@ std::shared_ptr VeloxColumnarBatch::from( auto compositeVeloxVector = makeRowVector(childNames, childVectors, cb->numRows(), pool); return std::make_shared(compositeVeloxVector); } - auto vp = velox::importFromArrowAsOwner( - *cb->exportArrowSchema(), *cb->exportArrowArray(), ArrowUtils::getBridgeOptions(), pool); + auto vp = velox::importFromArrowAsOwner(*cb->exportArrowSchema(), *cb->exportArrowArray(), pool); return std::make_shared(std::dynamic_pointer_cast(vp)); } diff --git a/cpp/velox/utils/VeloxArrowUtils.cc b/cpp/velox/utils/VeloxArrowUtils.cc index 051084b1c1eac..0349eb718b8e2 100644 --- a/cpp/velox/utils/VeloxArrowUtils.cc +++ b/cpp/velox/utils/VeloxArrowUtils.cc @@ -50,8 +50,7 @@ arrow::Result> recordBatch2VeloxColumnarBatch(con ArrowArray arrowArray; ArrowSchema arrowSchema; RETURN_NOT_OK(arrow::ExportRecordBatch(rb, &arrowArray, &arrowSchema)); - auto vp = velox::importFromArrowAsOwner( - arrowSchema, arrowArray, ArrowUtils::getBridgeOptions(), gluten::defaultLeafVeloxMemoryPool().get()); + auto vp = velox::importFromArrowAsOwner(arrowSchema, arrowArray, gluten::defaultLeafVeloxMemoryPool().get()); return std::make_shared(std::dynamic_pointer_cast(vp)); } diff --git a/ep/build-velox/src/get_velox.sh b/ep/build-velox/src/get_velox.sh index eb7cd5d841a43..8d401feefc7ca 100755 --- a/ep/build-velox/src/get_velox.sh +++ b/ep/build-velox/src/get_velox.sh @@ -17,7 +17,7 @@ set -exu VELOX_REPO=https://github.com/oap-project/velox.git -VELOX_BRANCH=2024_03_06 +VELOX_BRANCH=2024_03_07 VELOX_HOME="" #Set on run gluten on HDFS