diff --git a/cpp/velox/compute/iceberg/IcebergWriter.cc b/cpp/velox/compute/iceberg/IcebergWriter.cc index ea838ec9d12..76d7bb93c48 100644 --- a/cpp/velox/compute/iceberg/IcebergWriter.cc +++ b/cpp/velox/compute/iceberg/IcebergWriter.cc @@ -161,7 +161,15 @@ std::shared_ptr createIcebergInsertTableHandle( const std::unordered_map serdeParameters; auto writeKind = connector::hive::iceberg::IcebergInsertTableHandle::WriteKind::kData; return std::make_shared( - columnHandles, locationHandle, fileFormat, spec, compressionKind, serdeParameters, writeKind, fileNameGenerator); + columnHandles, + locationHandle, + fileFormat, + spec, + compressionKind, + serdeParameters, + writeKind, + std::unordered_map{}, + fileNameGenerator); } } // namespace diff --git a/cpp/velox/utils/VeloxWriterUtils.cc b/cpp/velox/utils/VeloxWriterUtils.cc index 0196aa57575..52551787c25 100644 --- a/cpp/velox/utils/VeloxWriterUtils.cc +++ b/cpp/velox/utils/VeloxWriterUtils.cc @@ -88,7 +88,7 @@ std::shared_ptr makeParquetWriteOp // please make sure `brotli` is enabled when compiling throw GlutenException("Gluten+velox does not support write parquet using brotli."); } else if (boost::iequals(compressionCodecStr, "lz4")) { - compressionCodec = CompressionKind::CompressionKind_LZ4; + compressionCodec = CompressionKind::CompressionKind_LZ4_HADOOP; } else if (boost::iequals(compressionCodecStr, "zstd")) { compressionCodec = CompressionKind::CompressionKind_ZSTD; auto codecOptions = std::make_shared(); diff --git a/ep/build-velox/src/get-velox.sh b/ep/build-velox/src/get-velox.sh index 080b10b0a38..3b7294127e0 100755 --- a/ep/build-velox/src/get-velox.sh +++ b/ep/build-velox/src/get-velox.sh @@ -18,8 +18,8 @@ set -exu CURRENT_DIR=$(cd "$(dirname "$BASH_SOURCE")"; pwd) VELOX_REPO=https://github.com/IBM/velox.git -VELOX_BRANCH=dft-2026_07_10 -VELOX_ENHANCED_BRANCH=ibm-2026_07_10 +VELOX_BRANCH=dft-2026_07_16 +VELOX_ENHANCED_BRANCH=ibm-2026_07_16 VELOX_HOME="" RUN_SETUP_SCRIPT=ON ENABLE_ENHANCED_FEATURES=OFF diff --git a/pom.xml b/pom.xml index f74955d0613..e4c4abf050f 100644 --- a/pom.xml +++ b/pom.xml @@ -2307,14 +2307,5 @@ ${platform}_${arch} - - disaggregated-shuffle - - false - - - gluten-disaggregated-shuffle - -