From 3ea97d66d190a4c72f3bca3ff82b3109e58709a4 Mon Sep 17 00:00:00 2001 From: Gluten Performance Bot <137994563+GlutenPerfBot@users.noreply.github.com> Date: Fri, 18 Oct 2024 16:28:29 +0800 Subject: [PATCH] [GLUTEN-6887][VL] Daily Update Velox Version (2024_10_18) (#7587) Upstream Velox's New Commits: d90038daf by Daniel Hunte, Clean up timezoneId from DateTimeFormatter (11259) 9d4cfb254 by Deepak Majeti, Remove config property hive.gcs.scheme (11235) ad510db79 by Yenda Li, Add trail function (11265) 1dd1e3e84 by aditi-pandit, Use PrefixSort in Window operator (10417) --- cpp/velox/utils/ConfigExtractor.cc | 14 ++------------ ep/build-velox/src/get_velox.sh | 2 +- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/cpp/velox/utils/ConfigExtractor.cc b/cpp/velox/utils/ConfigExtractor.cc index 707197eb0572..a83045b03e5e 100644 --- a/cpp/velox/utils/ConfigExtractor.cc +++ b/cpp/velox/utils/ConfigExtractor.cc @@ -125,19 +125,9 @@ std::shared_ptr getHiveConfig( // https://github.com/GoogleCloudDataproc/hadoop-connectors/blob/master/gcs/CONFIGURATION.md#api-client-configuration auto gsStorageRootUrl = conf->get("spark.hadoop.fs.gs.storage.root.url"); if (gsStorageRootUrl.hasValue()) { - std::string url = gsStorageRootUrl.value(); - std::string gcsScheme; - std::string gcsEndpoint; - - const auto sep = std::string("://"); - const auto pos = url.find_first_of(sep); - if (pos != std::string::npos) { - gcsScheme = url.substr(0, pos); - gcsEndpoint = url.substr(pos + sep.length()); - } + std::string gcsEndpoint = gsStorageRootUrl.value(); - if (!gcsEndpoint.empty() && !gcsScheme.empty()) { - hiveConfMap[facebook::velox::connector::hive::HiveConfig::kGCSScheme] = gcsScheme; + if (!gcsEndpoint.empty()) { hiveConfMap[facebook::velox::connector::hive::HiveConfig::kGCSEndpoint] = gcsEndpoint; } } diff --git a/ep/build-velox/src/get_velox.sh b/ep/build-velox/src/get_velox.sh index 5455f01fd9f4..ef5983165d7b 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_10_17 +VELOX_BRANCH=2024_10_18 VELOX_HOME="" OS=`uname -s`