Merge branch 'main' into split/delta-dv-java-scan-handoff-pr-clean

malinjawi · web-flow · commit d2f96cca3fba · 2026-06-10T16:02:24.000+03:00
diff --git a/cpp/velox/utils/ConfigExtractor.cc b/cpp/velox/utils/ConfigExtractor.cc
@@ -307,6 +307,8 @@ std::shared_ptr<facebook::velox::config::ConfigBase> createHiveConnectorConfig(
   // read as UTC
   hiveConfMap[facebook::velox::connector::hive::HiveConfig::kReadTimestampPartitionValueAsLocalTime] = "false";
 
+  hiveConfMap[facebook::velox::connector::hive::HiveConfig::kParquetNullStructForMissingFields] = "true";
+
   overwriteVeloxConf(conf.get(), hiveConfMap, kStaticBackendConfPrefix);
   return std::make_shared<facebook::velox::config::ConfigBase>(std::move(hiveConfMap));
 }
diff --git 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_06_05
-VELOX_ENHANCED_BRANCH=ibm-2026_06_05
+VELOX_BRANCH=dft-2026_06_06
+VELOX_ENHANCED_BRANCH=ibm-2026_06_06
 VELOX_HOME=""
 RUN_SETUP_SCRIPT=ON
 ENABLE_ENHANCED_FEATURES=OFF

Original file line number	Diff line number	Diff line change
`@@ -307,6 +307,8 @@ std::shared_ptr<facebook::velox::config::ConfigBase> createHiveConnectorConfig(`
`307`	`307`	`// read as UTC`
`308`	`308`	`hiveConfMap[facebook::velox::connector::hive::HiveConfig::kReadTimestampPartitionValueAsLocalTime] = "false";`
`309`	`309`
	`310`	`+ hiveConfMap[facebook::velox::connector::hive::HiveConfig::kParquetNullStructForMissingFields] = "true";`
	`311`	`+`
`310`	`312`	`overwriteVeloxConf(conf.get(), hiveConfMap, kStaticBackendConfPrefix);`
`311`	`313`	`return std::make_shared<facebook::velox::config::ConfigBase>(std::move(hiveConfMap));`
`312`	`314`	`}`