You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gluten.apache.org by ke...@apache.org on 2024/09/19 05:27:57 UTC
(incubator-gluten) branch main updated: [GLUTEN-6887][VL] Daily Update Velox Version (2024_09_19) (#7272)
This is an automated email from the ASF dual-hosted git repository.
kejia 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 0cb77714c4 [GLUTEN-6887][VL] Daily Update Velox Version (2024_09_19) (#7272)
0cb77714c4 is described below
commit 0cb77714c4b0bcae5dd5b23312291245e3565180
Author: JiaKe <ke...@intel.com>
AuthorDate: Thu Sep 19 13:27:52 2024 +0800
[GLUTEN-6887][VL] Daily Update Velox Version (2024_09_19) (#7272)
---
cpp/velox/compute/VeloxBackend.cc | 4 ++--
cpp/velox/memory/VeloxMemoryManager.cc | 2 +-
cpp/velox/shuffle/VeloxRssSortShuffleWriter.cc | 2 +-
cpp/velox/substrait/SubstraitToVeloxPlan.cc | 16 ++++++++--------
cpp/velox/substrait/VeloxSubstraitSignature.cc | 14 +++++++-------
cpp/velox/substrait/VeloxToSubstraitPlan.cc | 6 +++---
ep/build-velox/src/get_velox.sh | 2 +-
7 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/cpp/velox/compute/VeloxBackend.cc b/cpp/velox/compute/VeloxBackend.cc
index e070f0d1f9..ebe4426db4 100644
--- a/cpp/velox/compute/VeloxBackend.cc
+++ b/cpp/velox/compute/VeloxBackend.cc
@@ -176,7 +176,7 @@ void VeloxBackend::initCache() {
if (si.available < ssdCacheSize) {
VELOX_FAIL(
"not enough space for ssd cache in " + ssdCachePath + " cache size: " + std::to_string(ssdCacheSize) +
- "free space: " + std::to_string(si.available))
+ "free space: " + std::to_string(si.available));
}
velox::memory::MmapAllocator::Options options;
@@ -191,7 +191,7 @@ void VeloxBackend::initCache() {
asyncDataCache_ = velox::cache::AsyncDataCache::create(cacheAllocator_.get(), std::move(ssd));
}
- VELOX_CHECK_NOT_NULL(dynamic_cast<velox::cache::AsyncDataCache*>(asyncDataCache_.get()))
+ VELOX_CHECK_NOT_NULL(dynamic_cast<velox::cache::AsyncDataCache*>(asyncDataCache_.get()));
LOG(INFO) << "STARTUP: Using AsyncDataCache memory cache size: " << memCacheSize
<< ", ssdCache prefix: " << ssdCachePath << ", ssdCache size: " << ssdCacheSize
<< ", ssdCache shards: " << ssdCacheShards << ", ssdCache IO threads: " << ssdCacheIOThreads;
diff --git a/cpp/velox/memory/VeloxMemoryManager.cc b/cpp/velox/memory/VeloxMemoryManager.cc
index dc6ad6317c..cea3f99bbd 100644
--- a/cpp/velox/memory/VeloxMemoryManager.cc
+++ b/cpp/velox/memory/VeloxMemoryManager.cc
@@ -156,7 +156,7 @@ class ListenableArbitrator : public velox::memory::MemoryArbitrator {
"{} failed to grow {} bytes, current state {}",
pool->name(),
velox::succinctBytes(bytes),
- pool->toString())
+ pool->toString());
}
uint64_t shrinkCapacity0(velox::memory::MemoryPool* pool, uint64_t bytes) {
diff --git a/cpp/velox/shuffle/VeloxRssSortShuffleWriter.cc b/cpp/velox/shuffle/VeloxRssSortShuffleWriter.cc
index 4b3475547a..b50bf0fad8 100644
--- a/cpp/velox/shuffle/VeloxRssSortShuffleWriter.cc
+++ b/cpp/velox/shuffle/VeloxRssSortShuffleWriter.cc
@@ -134,7 +134,7 @@ arrow::Status VeloxRssSortShuffleWriter::evictRowVector(uint32_t partitionId) {
if (options_.partitioning != Partitioning::kSingle) {
if (auto it = rowVectorIndexMap_.find(partitionId); it != rowVectorIndexMap_.end()) {
const auto& rowIndices = it->second;
- VELOX_DCHECK(!rowIndices.empty())
+ VELOX_DCHECK(!rowIndices.empty());
size_t idx = 0;
const auto outputSize = rowIndices.size();
diff --git a/cpp/velox/substrait/SubstraitToVeloxPlan.cc b/cpp/velox/substrait/SubstraitToVeloxPlan.cc
index 0dab6b280a..71dcd4b504 100644
--- a/cpp/velox/substrait/SubstraitToVeloxPlan.cc
+++ b/cpp/velox/substrait/SubstraitToVeloxPlan.cc
@@ -226,7 +226,7 @@ core::AggregationNode::Step SubstraitToVeloxPlanConverter::toAggregationFunction
const auto& phase = sAggFuc.phase();
switch (phase) {
case ::substrait::AGGREGATION_PHASE_UNSPECIFIED:
- VELOX_FAIL("Aggregation phase not specified.")
+ VELOX_FAIL("Aggregation phase not specified.");
break;
case ::substrait::AGGREGATION_PHASE_INITIAL_TO_INTERMEDIATE:
return core::AggregationNode::Step::kPartial;
@@ -237,7 +237,7 @@ core::AggregationNode::Step SubstraitToVeloxPlanConverter::toAggregationFunction
case ::substrait::AGGREGATION_PHASE_INTERMEDIATE_TO_RESULT:
return core::AggregationNode::Step::kFinal;
default:
- VELOX_FAIL("Unexpected aggregation phase.")
+ VELOX_FAIL("Unexpected aggregation phase.");
}
}
@@ -259,7 +259,7 @@ std::string SubstraitToVeloxPlanConverter::toAggregationFunctionName(
suffix = "";
break;
default:
- VELOX_FAIL("Unexpected aggregation node step.")
+ VELOX_FAIL("Unexpected aggregation node step.");
}
return baseName + suffix;
}
@@ -765,7 +765,7 @@ core::PlanNodePtr SubstraitToVeloxPlanConverter::toVeloxPlan(const ::substrait::
for (const auto& output : requiredChildOutput) {
auto expression = exprConverter_->toVeloxExpr(output, inputType);
auto exprField = dynamic_cast<const core::FieldAccessTypedExpr*>(expression.get());
- VELOX_CHECK(exprField != nullptr, " the output in Generate Operator only support field")
+ VELOX_CHECK(exprField != nullptr, " the output in Generate Operator only support field");
replicated.emplace_back(std::dynamic_pointer_cast<const core::FieldAccessTypedExpr>(expression));
}
@@ -780,7 +780,7 @@ core::PlanNodePtr SubstraitToVeloxPlanConverter::toVeloxPlan(const ::substrait::
std::dynamic_pointer_cast<const ValueStreamNode>(childNode) != nullptr) &&
childNode->outputType()->size() > requiredChildOutput.size(),
"injectedProject is true, but the ProjectNode or ValueStreamNode (in case of projection fallback)"
- " is missing or does not have the corresponding projection field")
+ " is missing or does not have the corresponding projection field");
bool isStack = generateRel.has_advanced_extension() &&
SubstraitParser::configSetInOptimization(generateRel.advanced_extension(), "isStack=");
@@ -872,11 +872,11 @@ const core::WindowNode::Frame SubstraitToVeloxPlanConverter::createWindowFrame(
if (hasOffset) {
VELOX_CHECK(
frame.type != core::WindowNode::WindowType::kRange,
- "for RANGE frame offset, we should pre-calculate the range frame boundary and pass the column reference, but got a constant offset.")
+ "for RANGE frame offset, we should pre-calculate the range frame boundary and pass the column reference, but got a constant offset.");
return std::make_shared<core::ConstantTypedExpr>(BIGINT(), variant(offset));
} else {
VELOX_CHECK(
- frame.type != core::WindowNode::WindowType::kRows, "for ROW frame offset, we should pass a constant offset.")
+ frame.type != core::WindowNode::WindowType::kRows, "for ROW frame offset, we should pass a constant offset.");
return exprConverter_->toVeloxExpr(columnRef, inputType);
}
};
@@ -1355,7 +1355,7 @@ core::PlanNodePtr SubstraitToVeloxPlanConverter::toVeloxPlan(const ::substrait::
}
core::PlanNodePtr SubstraitToVeloxPlanConverter::toVeloxPlan(const ::substrait::Plan& substraitPlan) {
- VELOX_CHECK(checkTypeExtension(substraitPlan), "The type extension only have unknown type.")
+ VELOX_CHECK(checkTypeExtension(substraitPlan), "The type extension only have unknown type.");
// Construct the function map based on the Substrait representation,
// and initialize the expression converter with it.
constructFunctionMap(substraitPlan);
diff --git a/cpp/velox/substrait/VeloxSubstraitSignature.cc b/cpp/velox/substrait/VeloxSubstraitSignature.cc
index fa415cfef7..e1f716ae20 100644
--- a/cpp/velox/substrait/VeloxSubstraitSignature.cc
+++ b/cpp/velox/substrait/VeloxSubstraitSignature.cc
@@ -76,8 +76,8 @@ namespace {
using index = std::string::size_type;
index findEnclosingPos(std::string text, index from, char left, char right) {
- VELOX_CHECK(left != right)
- VELOX_CHECK(text.at(from) == left)
+ VELOX_CHECK(left != right);
+ VELOX_CHECK(text.at(from) == left);
int32_t stackedLeftChars = 0;
for (index idx = from; idx < text.size(); idx++) {
const char ch = text.at(idx);
@@ -91,12 +91,12 @@ index findEnclosingPos(std::string text, index from, char left, char right) {
return idx;
}
}
- VELOX_FAIL("Unable to find enclose character from text: " + text)
+ VELOX_FAIL("Unable to find enclose character from text: " + text);
}
index findSansNesting(std::string text, index from, char target, char left, char right) {
- VELOX_CHECK(left != right)
- VELOX_CHECK(target != left && target != right)
+ VELOX_CHECK(left != right);
+ VELOX_CHECK(target != left && target != right);
int32_t stackedLeftChars = 0;
for (index idx = from; idx < text.size(); idx++) {
const char ch = text.at(idx);
@@ -181,14 +181,14 @@ TypePtr VeloxSubstraitSignature::fromSubstraitSignature(const std::string& signa
if (typeStart == childrenTypes.size()) {
break;
}
- VELOX_CHECK(typeStart < childrenTypes.size())
+ VELOX_CHECK(typeStart < childrenTypes.size());
const size_t typeEnd = findSansNesting(childrenTypes, typeStart, delimiter, '<', '>');
if (typeEnd == std::string::npos) {
std::string typeStr = childrenTypes.substr(typeStart);
types.emplace_back(fromSubstraitSignature(typeStr));
break;
}
- VELOX_CHECK(childrenTypes.at(typeEnd) == delimiter)
+ VELOX_CHECK(childrenTypes.at(typeEnd) == delimiter);
std::string typeStr = childrenTypes.substr(typeStart, typeEnd - typeStart);
types.emplace_back(fromSubstraitSignature(typeStr));
typeStart = typeEnd + 1;
diff --git a/cpp/velox/substrait/VeloxToSubstraitPlan.cc b/cpp/velox/substrait/VeloxToSubstraitPlan.cc
index 21417c3b9b..4908f4dc8f 100644
--- a/cpp/velox/substrait/VeloxToSubstraitPlan.cc
+++ b/cpp/velox/substrait/VeloxToSubstraitPlan.cc
@@ -336,7 +336,7 @@ void VeloxToSubstraitPlanConvertor::toSubstrait(
sortRel->MergeFrom(
processSortFields(arena, orderByNode->sortingKeys(), orderByNode->sortingOrders(), source->outputType()));
- VELOX_CHECK(!orderByNode->isPartial(), "Substrait doesn't support partial order by yet")
+ VELOX_CHECK(!orderByNode->isPartial(), "Substrait doesn't support partial order by yet");
sortRel->mutable_common()->mutable_direct();
}
@@ -355,7 +355,7 @@ void VeloxToSubstraitPlanConvertor::toSubstrait(
sortRel->mutable_common()->mutable_direct();
- VELOX_CHECK(!topNNode->isPartial(), "Substrait doesn't support partial topN yet")
+ VELOX_CHECK(!topNNode->isPartial(), "Substrait doesn't support partial topN yet");
fetchRel->set_offset(0);
fetchRel->set_count(topNNode->count());
@@ -392,7 +392,7 @@ void VeloxToSubstraitPlanConvertor::toSubstrait(
fetchRel->set_offset(limitNode->offset());
fetchRel->set_count(limitNode->count());
- VELOX_CHECK(!limitNode->isPartial(), "Substrait doesn't support partial limit yet")
+ VELOX_CHECK(!limitNode->isPartial(), "Substrait doesn't support partial limit yet");
fetchRel->mutable_common()->mutable_direct();
}
diff --git a/ep/build-velox/src/get_velox.sh b/ep/build-velox/src/get_velox.sh
index 56d8650dfc..224a423421 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_09_18
+VELOX_BRANCH=2024_09_19
VELOX_HOME=""
OS=`uname -s`
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For additional commands, e-mail: commits-help@gluten.apache.org