diff --git a/presto-native-execution/CMakeLists.txt b/presto-native-execution/CMakeLists.txt index 513c3d82d1937..0088a9a299ca6 100644 --- a/presto-native-execution/CMakeLists.txt +++ b/presto-native-execution/CMakeLists.txt @@ -64,7 +64,6 @@ if(PRESTO_ENABLE_HDFS) set(VELOX_ENABLE_HDFS ON CACHE BOOL "Build HDFS Connector") - add_definitions(-DPRESTO_ENABLE_HDFS) endif() if(PRESTO_ENABLE_PARQUET) diff --git a/presto-native-execution/presto_cpp/main/CMakeLists.txt b/presto-native-execution/presto_cpp/main/CMakeLists.txt index 489cd24f3e9b7..6f6fef6d55616 100644 --- a/presto-native-execution/presto_cpp/main/CMakeLists.txt +++ b/presto-native-execution/presto_cpp/main/CMakeLists.txt @@ -14,7 +14,6 @@ add_subdirectory(types) add_subdirectory(http) add_subdirectory(common) add_subdirectory(thrift) -add_subdirectory(connectors) add_library( presto_server_lib @@ -41,7 +40,6 @@ target_link_libraries( $ $ $ - presto_adapters presto_common presto_exception presto_http diff --git a/presto-native-execution/presto_cpp/main/PrestoServer.cpp b/presto-native-execution/presto_cpp/main/PrestoServer.cpp index 48472852a8374..05847f7bc6d3c 100644 --- a/presto-native-execution/presto_cpp/main/PrestoServer.cpp +++ b/presto-native-execution/presto_cpp/main/PrestoServer.cpp @@ -27,7 +27,6 @@ #include "presto_cpp/main/common/Configs.h" #include "presto_cpp/main/common/Counters.h" #include "presto_cpp/main/common/Utils.h" -#include "presto_cpp/main/connectors/hive/storage_adapters/FileSystems.h" #include "presto_cpp/main/http/HttpServer.h" #include "presto_cpp/main/http/filters/AccessLogFilter.h" #include "presto_cpp/main/http/filters/StatsFilter.h" @@ -47,10 +46,6 @@ #include "velox/connectors/Connector.h" #include "velox/connectors/hive/HiveConnector.h" #include "velox/core/Config.h" -#include "velox/dwio/dwrf/reader/DwrfReader.h" -#include "velox/dwio/dwrf/writer/Writer.h" -#include "velox/dwio/parquet/RegisterParquetReader.h" -#include "velox/dwio/parquet/RegisterParquetWriter.h" #include "velox/exec/PartitionedOutputBufferManager.h" #include "velox/functions/prestosql/aggregates/RegisterAggregateFunctions.h" #include "velox/functions/prestosql/registration/RegistrationFunctions.h" @@ -172,7 +167,6 @@ void PrestoServer::run() { registerStatsCounters(); registerFileSinks(); registerFileSystems(); - registerOptionalHiveStorageAdapters(); registerShuffleInterfaceFactories(); registerCustomOperators(); protocol::registerHiveConnectors(); diff --git a/presto-native-execution/presto_cpp/main/connectors/CMakeLists.txt b/presto-native-execution/presto_cpp/main/connectors/CMakeLists.txt deleted file mode 100644 index 0e5fe71e0cad7..0000000000000 --- a/presto-native-execution/presto_cpp/main/connectors/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -add_subdirectory(hive) diff --git a/presto-native-execution/presto_cpp/main/connectors/hive/CMakeLists.txt b/presto-native-execution/presto_cpp/main/connectors/hive/CMakeLists.txt deleted file mode 100644 index 32db47d854eec..0000000000000 --- a/presto-native-execution/presto_cpp/main/connectors/hive/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -add_subdirectory(storage_adapters) diff --git a/presto-native-execution/presto_cpp/main/connectors/hive/storage_adapters/CMakeLists.txt b/presto-native-execution/presto_cpp/main/connectors/hive/storage_adapters/CMakeLists.txt deleted file mode 100644 index 017896bdf4818..0000000000000 --- a/presto-native-execution/presto_cpp/main/connectors/hive/storage_adapters/CMakeLists.txt +++ /dev/null @@ -1,20 +0,0 @@ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -add_library(presto_adapters FileSystems.cpp) -if(PRESTO_ENABLE_S3) - target_link_libraries(presto_adapters velox_s3fs) -endif() - -if(PRESTO_ENABLE_HDFS) - target_link_libraries(presto_adapters velox_hdfs) -endif() diff --git a/presto-native-execution/presto_cpp/main/connectors/hive/storage_adapters/FileSystems.cpp b/presto-native-execution/presto_cpp/main/connectors/hive/storage_adapters/FileSystems.cpp deleted file mode 100644 index 0c0a1e913eb59..0000000000000 --- a/presto-native-execution/presto_cpp/main/connectors/hive/storage_adapters/FileSystems.cpp +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "presto_cpp/main/connectors/hive/storage_adapters/FileSystems.h" - -#ifdef PRESTO_ENABLE_HDFS -#include "velox/connectors/hive/storage_adapters/hdfs/HdfsFileSystem.h" // @manual -#endif - -namespace facebook::presto { - -void registerOptionalHiveStorageAdapters() { -#ifdef PRESTO_ENABLE_HDFS - velox::filesystems::registerHdfsFileSystem(); -#endif -} - -} // namespace facebook::presto diff --git a/presto-native-execution/presto_cpp/main/connectors/hive/storage_adapters/FileSystems.h b/presto-native-execution/presto_cpp/main/connectors/hive/storage_adapters/FileSystems.h deleted file mode 100644 index 630ad39a6e2d2..0000000000000 --- a/presto-native-execution/presto_cpp/main/connectors/hive/storage_adapters/FileSystems.h +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -namespace facebook::presto { - -void registerOptionalHiveStorageAdapters(); - -} // namespace facebook::presto diff --git a/presto-native-execution/velox b/presto-native-execution/velox index 6a2d6f3fb56c1..3b0509a5203e9 160000 --- a/presto-native-execution/velox +++ b/presto-native-execution/velox @@ -1 +1 @@ -Subproject commit 6a2d6f3fb56c1e99b6a6fac1ebfc7407c64eb6d7 +Subproject commit 3b0509a5203e944e3582fbe86c561c49cc7c20cb