GH-50194: [C++] Move S3 and AWS-SDK to its own libarrow_s3.so #50195
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| # Licensed to the Apache Software Foundation (ASF) under one | ||
| # or more contributor license agreements. See the NOTICE file | ||
| # distributed with this work for additional information | ||
| # regarding copyright ownership. The ASF licenses this file | ||
| # to you 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. | ||
| # | ||
| # This config sets the following variables in your project:: | ||
| # | ||
| # ArrowS3_FOUND - true if Arrow S3 found on the system | ||
| # | ||
| # This config sets the following targets in your project:: | ||
| # | ||
| # ArrowS3::arrow_s3_shared - for linked as shared library if shared library is built | ||
| # ArrowS3::arrow_s3_static - for linked as static library if static library is built | ||
|
|
||
| @PACKAGE_INIT@ | ||
|
|
||
| set(ARROW_S3_SYSTEM_DEPENDENCIES "@ARROW_S3_SYSTEM_DEPENDENCIES@") | ||
|
|
||
| include(CMakeFindDependencyMacro) | ||
| find_dependency(Arrow CONFIG) | ||
|
|
||
| if(ARROW_BUILD_STATIC) | ||
| arrow_find_dependencies("${ARROW_S3_SYSTEM_DEPENDENCIES}") | ||
| endif() | ||
|
|
||
| include("${CMAKE_CURRENT_LIST_DIR}/ArrowS3Targets.cmake") | ||
|
|
||
| arrow_keep_backward_compatibility(ArrowS3 arrow_s3) | ||
|
|
||
| check_required_components(ArrowS3) | ||
|
|
||
| arrow_show_details(ArrowS3 ARROW_S3) |
|
Member
There was a problem hiding this comment. Should this remaining ARROW_S3 section get an update now? I've tried it locally on top of PR changes, seems OK; diff --git a/cpp/src/arrow/CMakeLists.txt b/cpp/src/arrow/CMakeLists.txt
@@ -111,22 +111,6 @@ if(ARROW_USE_GLOG)
endif()
endif()
-if(ARROW_S3)
- if(AWSSDK_SOURCE STREQUAL "SYSTEM")
- list(APPEND
- ARROW_STATIC_INSTALL_INTERFACE_LIBS
- aws-cpp-sdk-identity-management
- aws-cpp-sdk-sts
- aws-cpp-sdk-cognito-identity
- aws-cpp-sdk-s3
- aws-cpp-sdk-core)
- elseif(AWSSDK_SOURCE STREQUAL "BUNDLED")
- if(UNIX)
- list(APPEND ARROW_STATIC_INSTALL_INTERFACE_LIBS CURL::libcurl)
- endif()
- endif()
-endif()
if(ARROW_WITH_OPENTELEMETRY)
@@ -1070,6 +1054,10 @@ if(ARROW_FILESYSTEM)
if(AWSSDK_SOURCE STREQUAL "SYSTEM")
list(APPEND ARROW_S3_STATIC_INSTALL_INTERFACE_LIBS ${AWSSDK_LINK_LIBRARIES})
+ elseif(AWSSDK_SOURCE STREQUAL "BUNDLED")
+ if(UNIX)
+ list(APPEND ARROW_S3_STATIC_INSTALL_INTERFACE_LIBS CURL::libcurl)
+ endif()
endif()
add_arrow_lib(arrow_s3 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| # Licensed to the Apache Software Foundation (ASF) under one | ||
| # or more contributor license agreements. See the NOTICE file | ||
| # distributed with this work for additional information | ||
| # regarding copyright ownership. The ASF licenses this file | ||
| # to you 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. | ||
|
|
||
| prefix=@CMAKE_INSTALL_PREFIX@ | ||
| includedir=@ARROW_PKG_CONFIG_INCLUDEDIR@ | ||
| libdir=@ARROW_PKG_CONFIG_LIBDIR@ | ||
|
|
||
| Name: Apache Arrow S3 | ||
| Description: Apache Arrow's S3 filesystem implementation. | ||
| Version: @ARROW_VERSION@ | ||
| Requires: arrow@ARROW_S3_PC_REQUIRES@ | ||
| Requires.private:@ARROW_S3_PC_REQUIRES_PRIVATE@ | ||
| Libs: -L${libdir} -larrow_s3@ARROW_S3_PC_LIBS@ | ||
| Libs.private:@ARROW_S3_PC_LIBS_PRIVATE@ | ||
| Cflags:@ARROW_S3_PC_CFLAGS@ | ||
| Cflags.private:@ARROW_S3_PC_CFLAGS_PRIVATE@ | ||
|
raulcd marked this conversation as resolved.
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| // Licensed to the Apache Software Foundation (ASF) under one | ||
| // or more contributor license agreements. See the NOTICE file | ||
| // distributed with this work for additional information | ||
| // regarding copyright ownership. The ASF licenses this file | ||
| // to you 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. | ||
|
|
||
| #pragma once | ||
|
|
||
| #if defined(_WIN32) || defined(__CYGWIN__) | ||
| # if defined(_MSC_VER) | ||
| # pragma warning(push) | ||
| # pragma warning(disable : 4251) | ||
| # else | ||
| # pragma GCC diagnostic ignored "-Wattributes" | ||
| # endif | ||
|
|
||
| # ifdef ARROW_S3_STATIC | ||
| # define ARROW_S3_EXPORT | ||
| # elif defined(ARROW_S3_EXPORTING) | ||
| # define ARROW_S3_EXPORT __declspec(dllexport) | ||
| # else | ||
| # define ARROW_S3_EXPORT __declspec(dllimport) | ||
| # endif | ||
|
|
||
| # define ARROW_S3_NO_EXPORT | ||
|
|
||
| # if defined(_MSC_VER) | ||
| # pragma warning(pop) | ||
| # endif | ||
|
|
||
| #else // Not Windows | ||
| # ifndef ARROW_S3_EXPORT | ||
| # define ARROW_S3_EXPORT __attribute__((visibility("default"))) | ||
| # endif | ||
| # ifndef ARROW_S3_NO_EXPORT | ||
| # define ARROW_S3_NO_EXPORT __attribute__((visibility("hidden"))) | ||
| # endif | ||
| #endif |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.