Fun with exporting symbols

Author: raulcd

cpp/src/arrow/CMakeLists.txt

@@ -989,7 +989,16 @@ if(ARROW_FILESYSTEM)
                   ${ARROW_S3_SHARED_INSTALL_INTERFACE_LIBS}
                   STATIC_LINK_LIBS
                   arrow_static
-                  ${AWSSDK_LINK_LIBRARIES})
+                  ${AWSSDK_LINK_LIBRARIES}
+                  OUTPUTS
+                  ARROW_S3_LIBRARIES)
+    foreach(LIB_TARGET ${ARROW_S3_LIBRARIES})
+      target_compile_definitions(${LIB_TARGET} PRIVATE ARROW_S3_EXPORTING)
+    endforeach()
+    if(ARROW_BUILD_STATIC AND WIN32)
+      target_compile_definitions(arrow_s3_static PUBLIC ARROW_S3_STATIC)
+    endif()
+
     set_source_files_properties(filesystem/s3fs.cc filesystem/s3fs_module.cc
                                 PROPERTIES SKIP_UNITY_BUILD_INCLUSION ON)
   endif()

cpp/src/arrow/filesystem/s3_visibility.h

@@ -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

cpp/src/arrow/filesystem/s3fs.h

@@ -38,7 +38,7 @@ class STSClient;
 namespace arrow::fs {
 
 /// Options for using a proxy for S3
-struct ARROW_EXPORT S3ProxyOptions {
+struct ARROW_S3_EXPORT S3ProxyOptions {
   std::string scheme;
   std::string host;
   int port = -1;
@@ -67,7 +67,7 @@ enum class S3CredentialsKind : int8_t {
 };
 
 /// Pure virtual class for describing custom S3 retry strategies
-class ARROW_EXPORT S3RetryStrategy {
+class ARROW_S3_EXPORT S3RetryStrategy {
  public:
   virtual ~S3RetryStrategy() = default;
 
@@ -96,7 +96,7 @@ class ARROW_EXPORT S3RetryStrategy {
 };
 
 /// Options for the S3FileSystem implementation.
-struct ARROW_EXPORT S3Options {
+struct ARROW_S3_EXPORT S3Options {
   /// \brief Smart defaults for option values
   ///
   /// The possible values for this setting are explained in the AWS docs:
@@ -315,7 +315,7 @@ struct ARROW_EXPORT S3Options {
 /// Some implementation notes:
 /// - buckets are special and the operations available on them may be limited
 ///   or more expensive than desired.
-class ARROW_EXPORT S3FileSystem : public FileSystem {
+class ARROW_S3_EXPORT S3FileSystem : public FileSystem {
  public:
   ~S3FileSystem() override;
 
@@ -409,7 +409,7 @@ class ARROW_EXPORT S3FileSystem : public FileSystem {
 
 enum class S3LogLevel : int8_t { Off, Fatal, Error, Warn, Info, Debug, Trace };
 
-struct ARROW_EXPORT S3GlobalOptions {
+struct ARROW_S3_EXPORT S3GlobalOptions {
   /// The log level for S3-originating messages.
   S3LogLevel log_level;
 
@@ -444,21 +444,21 @@ struct ARROW_EXPORT S3GlobalOptions {
 ///
 /// Once this function is called you MUST call FinalizeS3 before the end of the
 /// application in order to avoid a segmentation fault at shutdown.
-ARROW_EXPORT
+ARROW_S3_EXPORT
 Status InitializeS3(const S3GlobalOptions& options);
 
 /// \brief Ensure the S3 APIs are initialized, but only if not already done.
 ///
 /// If necessary, this will call InitializeS3() with some default options.
-ARROW_EXPORT
+ARROW_S3_EXPORT
 Status EnsureS3Initialized();
 
 /// Whether S3 was initialized, and not finalized.
-ARROW_EXPORT
+ARROW_S3_EXPORT
 bool IsS3Initialized();
 
 /// Whether S3 was finalized.
-ARROW_EXPORT
+ARROW_S3_EXPORT
 bool IsS3Finalized();
 
 /// \brief Shutdown the S3 APIs.
@@ -470,16 +470,16 @@ bool IsS3Finalized();
 /// Calls to InitializeS3() and FinalizeS3() should be serialized by the
 /// application (this also applies to EnsureS3Initialized() and
 /// EnsureS3Finalized()).
-ARROW_EXPORT
+ARROW_S3_EXPORT
 Status FinalizeS3();
 
 /// \brief Ensure the S3 APIs are shutdown, but only if not already done.
 ///
 /// If necessary, this will call FinalizeS3().
-ARROW_EXPORT
+ARROW_S3_EXPORT
 Status EnsureS3Finalized();
 
-ARROW_EXPORT
+ARROW_S3_EXPORT
 Result<std::string> ResolveS3BucketRegion(const std::string& bucket);
 
 }  // namespace arrow::fs

cpp/src/arrow/filesystem/util_internal.h

@@ -83,6 +83,7 @@ enum class AuthorityHandlingBehavior {
 /// \param supported_schemes the set of URI schemes that should be accepted
 /// \param accept_local_paths if true, allow an absolute path
 /// \return the path portion of the URI
+ARROW_EXPORT
 Result<std::string> PathFromUriHelper(const std::string& uri_string,
                                       std::vector<std::string> supported_schemes,
                                       bool accept_local_paths,
@@ -95,6 +96,7 @@ ARROW_EXPORT
 Result<FileInfoVector> GlobFiles(const std::shared_ptr<FileSystem>& filesystem,
                                  const std::string& glob);
 
+ARROW_EXPORT
 extern FileSystemGlobalOptions global_options;
 
 /// \brief Unregister filesystem factories
@@ -106,16 +108,16 @@ ARROW_EXPORT
 Status UnregisterFileSystemFactory(const std::string& scheme);
 
 template <typename T>
-Result<T> GetOption(const std::string& key, const std::any& value) {
+ARROW_EXPORT Result<T> GetOption(const std::string& key, const std::any& value) {
   if (const auto* v = std::any_cast<T>(&value)) {
     return *v;
   }
   return Status::Invalid("Filesystem option '", key, "' has the wrong type");
 }
 
 template <typename T>
-Result<std::shared_ptr<const T>> GetConstSharedPtrOption(const std::string& key,
-                                                         const std::any& value) {
+ARROW_EXPORT Result<std::shared_ptr<const T>> GetConstSharedPtrOption(
+    const std::string& key, const std::any& value) {
   if (const auto* v = std::any_cast<std::shared_ptr<const T>>(&value)) return *v;
   if (const auto* v = std::any_cast<std::shared_ptr<T>>(&value)) return *v;
   return Status::Invalid("Filesystem option '", key, "' has the wrong type");