Skip to content

Commit

Permalink
[GLUTEN-6887][VL] Daily Update Velox Version (2024_10_18) (apache#7587)
Browse files Browse the repository at this point in the history
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)
  • Loading branch information
GlutenPerfBot authored Oct 18, 2024
1 parent 2721484 commit 3ea97d6
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 13 deletions.
14 changes: 2 additions & 12 deletions cpp/velox/utils/ConfigExtractor.cc
Original file line number Diff line number Diff line change
Expand Up @@ -125,19 +125,9 @@ std::shared_ptr<facebook::velox::config::ConfigBase> getHiveConfig(
// https://github.com/GoogleCloudDataproc/hadoop-connectors/blob/master/gcs/CONFIGURATION.md#api-client-configuration
auto gsStorageRootUrl = conf->get<std::string>("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;
}
}
Expand Down
2 changes: 1 addition & 1 deletion ep/build-velox/src/get_velox.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down

0 comments on commit 3ea97d6

Please sign in to comment.