diff --git a/cpp/velox/substrait/SubstraitToVeloxPlanValidator.cc b/cpp/velox/substrait/SubstraitToVeloxPlanValidator.cc index 6b10b805ed1..3ea800b60ce 100644 --- a/cpp/velox/substrait/SubstraitToVeloxPlanValidator.cc +++ b/cpp/velox/substrait/SubstraitToVeloxPlanValidator.cc @@ -25,6 +25,7 @@ #include "velox/exec/Aggregate.h" #include "velox/expression/Expr.h" #include "velox/expression/SignatureBinder.h" +#include "velox/type/TypeCoercer.h" namespace gluten { namespace { @@ -1159,7 +1160,7 @@ bool SubstraitToVeloxPlanValidator::validateAggRelFunctionType(const ::substrait bool resolved = false; for (const auto& signature : signaturesOpt.value()) { - exec::SignatureBinder binder(*signature, types); + exec::SignatureBinder binder(*signature, types, facebook::velox::TypeCoercer::defaults()); if (binder.tryBind()) { TypePtr resolveType = nullptr; try { diff --git a/cpp/velox/utils/ConfigExtractor.cc b/cpp/velox/utils/ConfigExtractor.cc index 6006d990dbe..b0b6c1a99a8 100644 --- a/cpp/velox/utils/ConfigExtractor.cc +++ b/cpp/velox/utils/ConfigExtractor.cc @@ -25,7 +25,7 @@ #include "utils/Macros.h" #include "velox/connectors/hive/HiveConfig.h" #include "velox/connectors/hive/storage_adapters/s3fs/S3Config.h" -#include "velox/dwio/parquet/writer/Writer.h" +#include "velox/dwio/parquet/writer/WriterConfig.h" namespace gluten { @@ -229,7 +229,7 @@ std::shared_ptr createHiveConnectorSessionC configs[facebook::velox::connector::hive::HiveConfig::kFileColumnNamesReadAsLowerCaseSession] = !conf->get(kCaseSensitive, false) ? "true" : "false"; configs[facebook::velox::connector::hive::HiveConfig::kPartitionPathAsLowerCaseSession] = "false"; - configs[facebook::velox::parquet::WriterOptions::kParquetWriteTimestampUnit] = std::string("6"); + configs[facebook::velox::parquet::WriterConfig::kParquetSessionWriteTimestampUnit] = std::string("6"); configs[facebook::velox::connector::hive::HiveConfig::kReadTimestampUnitSession] = std::string("6"); configs[facebook::velox::connector::hive::HiveConfig::kMaxPartitionsPerWritersSession] = conf->get(kMaxPartitions, "10000"); @@ -243,7 +243,7 @@ std::shared_ptr createHiveConnectorSessionC conf->get(kAllowInt32Narrowing, true) ? "true" : "false"; configs[facebook::velox::connector::hive::HiveConfig::kOrcUseColumnNamesSession] = conf->get(kOrcUseColumnNames, true) ? "true" : "false"; - configs[facebook::velox::parquet::WriterOptions::kParquetWritePageSize] = + configs[facebook::velox::parquet::WriterConfig::kParquetSessionWritePageSize] = conf->get(kWriteParquetPageSizeBytes, "1MB"); overwriteVeloxConf(conf.get(), configs, kDynamicBackendConfPrefix); diff --git a/ep/build-velox/src/get-velox.sh b/ep/build-velox/src/get-velox.sh index a6631e1e762..51034c77f78 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_05_15 -VELOX_ENHANCED_BRANCH=ibm-2026_05_15 +VELOX_BRANCH=dft-2026_05_18 +VELOX_ENHANCED_BRANCH=ibm-2026_05_18 VELOX_HOME="" RUN_SETUP_SCRIPT=ON ENABLE_ENHANCED_FEATURES=OFF