From 5442d1ba3ea429be836c64fa777dfe4a5363399d Mon Sep 17 00:00:00 2001 From: zuyu Date: Wed, 13 Nov 2024 19:38:05 -0800 Subject: [PATCH] [native] Advance Velox and Fix Gcs naming (#24037) --- presto-native-execution/presto_cpp/main/PrestoServer.cpp | 8 -------- presto-native-execution/velox | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/presto-native-execution/presto_cpp/main/PrestoServer.cpp b/presto-native-execution/presto_cpp/main/PrestoServer.cpp index f4c658fbec838..bdc998779469d 100644 --- a/presto-native-execution/presto_cpp/main/PrestoServer.cpp +++ b/presto-native-execution/presto_cpp/main/PrestoServer.cpp @@ -49,11 +49,7 @@ #include "velox/connectors/hive/HiveConnector.h" #include "velox/connectors/hive/HiveDataSink.h" #include "velox/connectors/hive/storage_adapters/abfs/RegisterAbfsFileSystem.h" -#ifdef VELOX_ENABLE_FORWARD_COMPATIBILITY #include "velox/connectors/hive/storage_adapters/gcs/RegisterGcsFileSystem.h" -#else -#include "velox/connectors/hive/storage_adapters/gcs/RegisterGCSFileSystem.h" -#endif #include "velox/connectors/hive/storage_adapters/hdfs/RegisterHdfsFileSystem.h" #include "velox/connectors/hive/storage_adapters/s3fs/RegisterS3FileSystem.h" #include "velox/connectors/tpch/TpchConnector.h" @@ -1296,11 +1292,7 @@ void PrestoServer::registerFileSystems() { velox::filesystems::registerLocalFileSystem(); velox::filesystems::registerS3FileSystem(); velox::filesystems::registerHdfsFileSystem(); -#ifdef VELOX_ENABLE_FORWARD_COMPATIBILITY velox::filesystems::registerGcsFileSystem(); -#else - velox::filesystems::registerGCSFileSystem(); -#endif velox::filesystems::abfs::registerAbfsFileSystem(); } diff --git a/presto-native-execution/velox b/presto-native-execution/velox index 7437093486fdb..99979c4e7a399 160000 --- a/presto-native-execution/velox +++ b/presto-native-execution/velox @@ -1 +1 @@ -Subproject commit 7437093486fdb30389cbeb62ba1dc883f3f814c5 +Subproject commit 99979c4e7a3999e74a9d8640f302050953c5f39b