Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[VL] Daily Update Velox Version (2024_03_07) #4877

Merged
merged 2 commits into from
Mar 8, 2024
Merged

[VL] Daily Update Velox Version (2024_03_07) #4877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c2a0d9
[VL] Daily Update Velox Version (2024_03_07)
Mar 7, 2024
fc7696f
Fix build error
PHILO-HE Mar 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions cpp/velox/benchmarks/ColumnarToRowBenchmark.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 1 addition & 2 deletions cpp/velox/benchmarks/ParquetWriteBenchmark.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}

Expand Down
5 changes: 1 addition & 4 deletions cpp/velox/benchmarks/common/BenchmarkUtils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions cpp/velox/compute/WholeStageResultIterator.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
3 changes: 1 addition & 2 deletions cpp/velox/memory/VeloxColumnarBatch.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}

Expand Down
3 changes: 1 addition & 2 deletions cpp/velox/utils/VeloxArrowUtils.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}

Expand Down
2 changes: 1 addition & 1 deletion ep/build-velox/src/get_velox.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading