Skip to content

Commit

Permalink
[GLUTEN-6887][VL] Daily Update Velox Version (2024_11_14) (#7942)
Browse files Browse the repository at this point in the history
Upstream Velox's New Commits:

99979c4e7 by Krishna Pai, Back out "Readd: [velox][PR] Add runner for local distributed execution" (11529)
24a36c059 by Pedro Pedreira, docs: Add CONTRIBUTING guidelines for broken CI jobs (11521)
beada2b62 by Kevin Wilfong, Fix Presto's date_trunc function when dealing with daylight savings (11509)
08dba0f73 by Deepak Majeti, Add GCS Writer Sink and fix Gcs naming (11328)
f34035b03 by zhli1142015, Support decimal type for Spark unaryminus function (11454)
a993e053b by duanmeng, Extracts trace node name automatically in trace replayer (11519)
06ab00135 by NEUpanning, Disable aggregate pushdown for decimal type (11298)
6c25a9120 by Krishna Pai, Throw if Aggregation Filter clause has non boolean expression (11524)
8b1717546 by aditi-pandit, refactor: Combine loops in PrestoSerializerTest.validateLexer (11434)
5ab1a8f45 by Minhan Cao, refactor: Remove Parquet thrift code from Arrow writer (11489)
145f1650e by Orri Erling, Readd: [velox][PR] Add runner for local distributed execution (11507)
711494383 by Richard Barnes, Remove unused-variable in velox/dwio/parquet/reader/DeltaByteArrayDecoder.h (11528)
a5a2cad2d by David Reveman, Initial import of breeze (10770)
39aa1caf7 by Jimmy Lu, feat(dwio): Delta update support in selective readers (11501)
1f4ccc3c1 by Joe Abraham, Rename variables in Base64.* for readability (11299)
65c49f4b6 by aditi-pandit, Code cleanup in TopNRowNumber (11422)
05dc84155 by Chengcheng Jin, Support long decimal in prefixsort (10385)
117b5df60 by Jialiang Tan, Add fs fault injection in memory arbitrator fuzzer spill (11432)
d4bdc3b0e by zhli1142015, Ensure prefix length does not exceed configured maximum (11496)
c42320042 by Jialiang Tan, Make arbitration timed lock TSAN compatible (11517)
f1ff2dff0 by Pramod, Fix `l_quantity` data generated by Tpch connector (11511)
f6276bb6a by Deepak Majeti, doc: Add S3 Bucket config, fix Generic config and Spark-specific config (11418)
  • Loading branch information
GlutenPerfBot authored Nov 14, 2024
1 parent f8a2dca commit 9a7814d
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions cpp/velox/compute/VeloxBackend.cc
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
#include "velox/connectors/hive/HiveConnector.h"
#include "velox/connectors/hive/HiveDataSource.h"
#include "velox/connectors/hive/storage_adapters/abfs/RegisterAbfsFileSystem.h" // @manual
#include "velox/connectors/hive/storage_adapters/gcs/RegisterGCSFileSystem.h" // @manual
#include "velox/connectors/hive/storage_adapters/gcs/RegisterGcsFileSystem.h" // @manual
#include "velox/connectors/hive/storage_adapters/hdfs/RegisterHdfsFileSystem.h" // @manual
#include "velox/connectors/hive/storage_adapters/s3fs/RegisterS3FileSystem.h" // @manual
#include "velox/dwio/orc/reader/OrcReader.h"
Expand Down Expand Up @@ -142,7 +142,7 @@ void VeloxBackend::init(const std::unordered_map<std::string, std::string>& conf
velox::filesystems::registerS3FileSystem();
#endif
#ifdef ENABLE_GCS
velox::filesystems::registerGCSFileSystem();
velox::filesystems::registerGcsFileSystem();
#endif
#ifdef ENABLE_ABFS
velox::filesystems::abfs::registerAbfsFileSystem();
Expand Down
2 changes: 1 addition & 1 deletion cpp/velox/operators/writer/VeloxParquetDataSource.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
#include "velox/connectors/hive/storage_adapters/s3fs/S3Util.h"
#endif
#ifdef ENABLE_GCS
#include "velox/connectors/hive/storage_adapters/gcs/GCSFileSystem.h"
#include "velox/connectors/hive/storage_adapters/gcs/GcsFileSystem.h"
#endif
#ifdef ENABLE_HDFS
#include "velox/connectors/hive/storage_adapters/hdfs/HdfsFileSystem.h"
Expand Down
2 changes: 1 addition & 1 deletion cpp/velox/operators/writer/VeloxParquetDataSourceGCS.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class VeloxParquetDataSourceGCS final : public VeloxParquetDataSource {

void initSink(const std::unordered_map<std::string, std::string>& /* sparkConfs */) override {
auto fileSystem = filesystems::getFileSystem(filePath_, nullptr);
auto* gcsFileSystem = dynamic_cast<filesystems::GCSFileSystem*>(fileSystem.get());
auto* gcsFileSystem = dynamic_cast<filesystems::GcsFileSystem*>(fileSystem.get());
sink_ = std::make_unique<dwio::common::WriteFileSink>(
gcsFileSystem->openFileForWrite(filePath_, {{}, sinkPool_.get()}), filePath_);
}
Expand Down
8 changes: 4 additions & 4 deletions cpp/velox/utils/ConfigExtractor.cc
Original file line number Diff line number Diff line change
Expand Up @@ -141,21 +141,21 @@ std::shared_ptr<facebook::velox::config::ConfigBase> getHiveConfig(
std::string gcsEndpoint = gsStorageRootUrl.value();

if (!gcsEndpoint.empty()) {
hiveConfMap[facebook::velox::connector::hive::HiveConfig::kGCSEndpoint] = gcsEndpoint;
hiveConfMap[facebook::velox::connector::hive::HiveConfig::kGcsEndpoint] = gcsEndpoint;
}
}

// https://github.com/GoogleCloudDataproc/hadoop-connectors/blob/master/gcs/CONFIGURATION.md#http-transport-configuration
// https://cloud.google.com/cpp/docs/reference/storage/latest/classgoogle_1_1cloud_1_1storage_1_1LimitedErrorCountRetryPolicy
auto gsMaxRetryCount = conf->get<std::string>("spark.hadoop.fs.gs.http.max.retry");
if (gsMaxRetryCount.hasValue()) {
hiveConfMap[facebook::velox::connector::hive::HiveConfig::kGCSMaxRetryCount] = gsMaxRetryCount.value();
hiveConfMap[facebook::velox::connector::hive::HiveConfig::kGcsMaxRetryCount] = gsMaxRetryCount.value();
}

// https://cloud.google.com/cpp/docs/reference/storage/latest/classgoogle_1_1cloud_1_1storage_1_1LimitedTimeRetryPolicy
auto gsMaxRetryTime = conf->get<std::string>("spark.hadoop.fs.gs.http.max.retry-time");
if (gsMaxRetryTime.hasValue()) {
hiveConfMap[facebook::velox::connector::hive::HiveConfig::kGCSMaxRetryTime] = gsMaxRetryTime.value();
hiveConfMap[facebook::velox::connector::hive::HiveConfig::kGcsMaxRetryTime] = gsMaxRetryTime.value();
}

// https://github.com/GoogleCloudDataproc/hadoop-connectors/blob/master/gcs/CONFIGURATION.md#authentication
Expand All @@ -166,7 +166,7 @@ std::shared_ptr<facebook::velox::config::ConfigBase> getHiveConfig(
auto gsAuthServiceAccountJsonKeyfile =
conf->get<std::string>("spark.hadoop.fs.gs.auth.service.account.json.keyfile");
if (gsAuthServiceAccountJsonKeyfile.hasValue()) {
hiveConfMap[facebook::velox::connector::hive::HiveConfig::kGCSCredentialsPath] =
hiveConfMap[facebook::velox::connector::hive::HiveConfig::kGcsCredentialsPath] =
gsAuthServiceAccountJsonKeyfile.value();
} else {
LOG(WARNING) << "STARTUP: conf spark.hadoop.fs.gs.auth.type is set to SERVICE_ACCOUNT_JSON_KEYFILE, "
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_11_13_new
VELOX_BRANCH=2024_11_14
VELOX_HOME=""

OS=`uname -s`
Expand Down

0 comments on commit 9a7814d

Please sign in to comment.