This is an automated email from the ASF dual-hosted git repository.
philo pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-gluten.git
The following commit(s) were added to refs/heads/main by this push:
new c2a030f33 [VL] Daily Update Velox Version (2024_03_07) (#4877)
c2a030f33 is described below
commit c2a030f33f783bc877031bdb6d4b252e2a470156
Author: Gluten Performance Bot
<[email protected]>
AuthorDate: Fri Mar 8 14:09:58 2024 +0800
[VL] Daily Update Velox Version (2024_03_07) (#4877)
Co-authored-by: PHILO-HE <[email protected]>
---
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 2f2ff2ce1..16b3b6e0b 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 7958765fa..d9b2cf77a 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<VeloxColumnarBatch>(std::dynamic_pointer_cast<velox::RowVector>(vp));
}
diff --git a/cpp/velox/benchmarks/common/BenchmarkUtils.h
b/cpp/velox/benchmarks/common/BenchmarkUtils.h
index 0bd09b947..f06f5bbd5 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<gluten::ColumnarBatch>
convertBatch(std::shared_ptr<gluten::ColumnarBatch> 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<gluten::VeloxColumnarBatch>(std::dynamic_pointer_cast<facebook::velox::RowVector>(vp));
} else {
return cb;
diff --git a/cpp/velox/compute/WholeStageResultIterator.cc
b/cpp/velox/compute/WholeStageResultIterator.cc
index 214d3cab9..b74b8504d 100644
--- a/cpp/velox/compute/WholeStageResultIterator.cc
+++ b/cpp/velox/compute/WholeStageResultIterator.cc
@@ -506,8 +506,6 @@ std::unordered_map<std::string, std::string>
WholeStageResultIterator::getQueryC
configs[velox::core::QueryConfig::kMaxSplitPreloadPerDriver] =
std::to_string(veloxCfg_->get<int32_t>(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 f55bb1845..da004340c 100644
--- a/cpp/velox/memory/VeloxColumnarBatch.cc
+++ b/cpp/velox/memory/VeloxColumnarBatch.cc
@@ -118,8 +118,7 @@ std::shared_ptr<VeloxColumnarBatch>
VeloxColumnarBatch::from(
auto compositeVeloxVector = makeRowVector(childNames, childVectors,
cb->numRows(), pool);
return std::make_shared<VeloxColumnarBatch>(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<VeloxColumnarBatch>(std::dynamic_pointer_cast<velox::RowVector>(vp));
}
diff --git a/cpp/velox/utils/VeloxArrowUtils.cc
b/cpp/velox/utils/VeloxArrowUtils.cc
index 051084b1c..0349eb718 100644
--- a/cpp/velox/utils/VeloxArrowUtils.cc
+++ b/cpp/velox/utils/VeloxArrowUtils.cc
@@ -50,8 +50,7 @@ arrow::Result<std::shared_ptr<ColumnarBatch>>
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<VeloxColumnarBatch>(std::dynamic_pointer_cast<velox::RowVector>(vp));
}
diff --git a/ep/build-velox/src/get_velox.sh b/ep/build-velox/src/get_velox.sh
index eb7cd5d84..8d401feef 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
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
