diff --git a/cpp/velox/compute/WholeStageResultIterator.cc b/cpp/velox/compute/WholeStageResultIterator.cc index 98ef72f1bc63..14044782bc2f 100644 --- a/cpp/velox/compute/WholeStageResultIterator.cc +++ b/cpp/velox/compute/WholeStageResultIterator.cc @@ -46,7 +46,6 @@ const std::string kJoinSpillEnabled = "spark.gluten.sql.columnar.backend.velox.j const std::string kOrderBySpillEnabled = "spark.gluten.sql.columnar.backend.velox.orderBySpillEnabled"; const std::string kMaxSpillLevel = "spark.gluten.sql.columnar.backend.velox.maxSpillLevel"; const std::string kMaxSpillFileSize = "spark.gluten.sql.columnar.backend.velox.maxSpillFileSize"; -const std::string kMinSpillRunSize = "spark.gluten.sql.columnar.backend.velox.minSpillRunSize"; const std::string kSpillStartPartitionBit = "spark.gluten.sql.columnar.backend.velox.spillStartPartitionBit"; const std::string kSpillPartitionBits = "spark.gluten.sql.columnar.backend.velox.spillPartitionBits"; const std::string kSpillableReservationGrowthPct = @@ -514,8 +513,6 @@ std::unordered_map WholeStageResultIterator::getQueryC configs[velox::core::QueryConfig::kMaxSpillLevel] = std::to_string(veloxCfg_->get(kMaxSpillLevel, 4)); configs[velox::core::QueryConfig::kMaxSpillFileSize] = std::to_string(veloxCfg_->get(kMaxSpillFileSize, 20L * 1024 * 1024)); - configs[velox::core::QueryConfig::kMinSpillRunSize] = - std::to_string(veloxCfg_->get(kMinSpillRunSize, 256 << 20)); configs[velox::core::QueryConfig::kSpillStartPartitionBit] = std::to_string(veloxCfg_->get(kSpillStartPartitionBit, 29)); configs[velox::core::QueryConfig::kJoinSpillPartitionBits] = diff --git a/docs/get-started/Velox.md b/docs/get-started/Velox.md index 92381a74cde7..df0c6ec051d8 100644 --- a/docs/get-started/Velox.md +++ b/docs/get-started/Velox.md @@ -343,7 +343,6 @@ Using the following configuration options to customize spilling: | spark.gluten.sql.columnar.backend.velox.orderBySpillEnabled | true | Whether spill is enabled on sorts | | spark.gluten.sql.columnar.backend.velox.maxSpillLevel | 4 | The max allowed spilling level with zero being the initial spilling level | | spark.gluten.sql.columnar.backend.velox.maxSpillFileSize | 20MB | The max allowed spill file size. If it is zero, then there is no limit | -| spark.gluten.sql.columnar.backend.velox.minSpillRunSize | 268435456 | The min spill run size limit used to select partitions for spilling | | spark.gluten.sql.columnar.backend.velox.spillStartPartitionBit | 29 | The start partition bit which is used with 'spillPartitionBits' together to calculate the spilling partition number | | spark.gluten.sql.columnar.backend.velox.spillPartitionBits | 2 | The number of bits used to calculate the spilling partition number. The number of spilling partitions will be power of two | | spark.gluten.sql.columnar.backend.velox.spillableReservationGrowthPct | 25 | The spillable memory reservation growth percentage of the previous memory reservation size | diff --git a/ep/build-velox/src/get_velox.sh b/ep/build-velox/src/get_velox.sh index 70a1e5839e61..20ae27440f35 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_30 +VELOX_BRANCH=2024_04_01 VELOX_HOME="" #Set on run gluten on HDFS