This is an automated email from the ASF dual-hosted git repository.
yuanzhou 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 04df29d76 [VL] Daily Update Velox Version (2024_05_10) (#5678)
04df29d76 is described below
commit 04df29d76d89b309af8519a1fb79a4cdfe3bb7f6
Author: Gluten Performance Bot
<[email protected]>
AuthorDate: Fri May 10 15:39:12 2024 +0800
[VL] Daily Update Velox Version (2024_05_10) (#5678)
Velox changes
```
7d76b1d9e by Jialiang Tan, Propagate additional dwrf writer options (9752)
49c3ebb20 by gaoyangxiaozhu, Row index metadata column support for table
scan (9174)
3e98d4080 by Jimmy Lu, Remove lint warnings in ParquetReaderTest (9760)
dceaff0f2 by Jimmy Lu, Move E2EFilterTestBase into tests/utils to be reused
by Nimble (9749)
eb356fddc by chliang, Create row type for list children when there are >1
child fields (9533)
c325d4fa6 by xiaoxmeng, Add async memory reclaim task to avoid recursive
arbitration (9734)
b8a26ce8e by Jialiang Tan, Add memory and cache stats to
PeriodicStatsReporter (9723)
9ad161abf by Sergey Pershin, Keep weak pointers of Drivers closed by Task.
(9751)
```
---
.github/workflows/velox_docker_cache.yml | 8 ++++++--
cpp/velox/memory/VeloxMemoryManager.cc | 2 ++
ep/build-velox/src/get_velox.sh | 2 +-
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/velox_docker_cache.yml
b/.github/workflows/velox_docker_cache.yml
index d79b5e717..91676dbb6 100644
--- a/.github/workflows/velox_docker_cache.yml
+++ b/.github/workflows/velox_docker_cache.yml
@@ -74,7 +74,6 @@ jobs:
cd ep/build-velox/src && \
./get_velox.sh
cd ../build/velox_ep/
- git reset --hard
make EXTRA_CMAKE_FLAGS="-DVELOX_ENABLE_PARQUET=ON
-DVELOX_BUILD_TESTING=ON -DVELOX_BUILD_TEST_UTILS=ON"
- name: CCache after
@@ -92,6 +91,12 @@ jobs:
container: ghcr.io/facebookincubator/velox-dev:circleci-avx
steps:
- uses: actions/checkout@v2
+ - name: Setup java and maven
+ run: |
+ yum install sudo patch java-1.8.0-openjdk-devel wget -y && \
+ wget
https://downloads.apache.org/maven/maven-3/3.8.8/binaries/apache-maven-3.8.8-bin.tar.gz
+ tar -xvf apache-maven-3.8.8-bin.tar.gz
+ mv apache-maven-3.8.8 /usr/lib/maven
- name: Get Ccache
uses: actions/cache/restore@v3
with:
@@ -108,7 +113,6 @@ jobs:
./get_velox.sh
cd ../build/velox_ep/
source /opt/rh/gcc-toolset-9/enable
- git reset --hard
make EXTRA_CMAKE_FLAGS="-DVELOX_ENABLE_PARQUET=ON
-DVELOX_BUILD_TESTING=ON -DVELOX_BUILD_TEST_UTILS=ON"
- name: CCache after
diff --git a/cpp/velox/memory/VeloxMemoryManager.cc
b/cpp/velox/memory/VeloxMemoryManager.cc
index 1347bb950..f49beaccd 100644
--- a/cpp/velox/memory/VeloxMemoryManager.cc
+++ b/cpp/velox/memory/VeloxMemoryManager.cc
@@ -53,6 +53,7 @@ class ListenableArbitrator : public
velox::memory::MemoryArbitrator {
velox::memory::MemoryPool* pool,
const std::vector<std::shared_ptr<velox::memory::MemoryPool>>&
candidatePools,
uint64_t targetBytes) override {
+ velox::memory::ScopedMemoryArbitrationContext ctx(pool);
VELOX_CHECK_EQ(candidatePools.size(), 1, "ListenableArbitrator should only
be used within a single root pool")
auto candidate = candidatePools.back();
VELOX_CHECK(pool->root() == candidate.get(), "Illegal state in
ListenableArbitrator");
@@ -67,6 +68,7 @@ class ListenableArbitrator : public
velox::memory::MemoryArbitrator {
uint64_t targetBytes,
bool allowSpill,
bool allowAbort) override {
+ velox::memory::ScopedMemoryArbitrationContext ctx(nullptr);
facebook::velox::exec::MemoryReclaimer::Stats status;
VELOX_CHECK_EQ(pools.size(), 1, "Gluten only has one root pool");
std::lock_guard<std::recursive_mutex> l(mutex_); // FIXME: Do we have
recursive locking for this mutex?
diff --git a/ep/build-velox/src/get_velox.sh b/ep/build-velox/src/get_velox.sh
index 859bb2cbc..46dc793ed 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_05_09
+VELOX_BRANCH=2024_05_10
VELOX_HOME=""
#Set on run gluten on HDFS
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
