ARROW-2034: [C++] Filesystem implementation for Azure Blob Storage #12914
There are no files selected for viewing
This file contains 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 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 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 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 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 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 |
|---|---|---|
|
|
@@ -37,6 +37,34 @@ if(ARROW_GCS) | |
| Boost::system) | ||
| endif() | ||
|
|
||
| if(ARROW_AZURE) | ||
| set(AZURE_SRCS) | ||
| list(APPEND | ||
| AZURE_SRCS | ||
| azurefs_mock.cc | ||
| azurefs.cc) | ||
|
|
||
| add_arrow_lib(azurefs | ||
| SOURCES | ||
| ${AZURE_SRCS} | ||
| SHARED_LINK_LIBS | ||
| ${ARROW_LINK_LIBS} | ||
| SHARED_PRIVATE_LINK_LIBS | ||
| ${ARROW_SHARED_PRIVATE_LINK_LIBS} | ||
| STATIC_LINK_LIBS | ||
| ${ARROW_STATIC_LINK_LIBS}) | ||
|
|
||
| set_target_properties(azurefs_objlib PROPERTIES CXX_STANDARD 14 CXX_STANDARD_REQUIRED ON) | ||
|
There was a problem hiding this comment. Ah, sorry. I forgot that we embed filesystem modules to How about changing the default C++ version? diff --git a/cpp/cmake_modules/SetupCxxFlags.cmake b/cpp/cmake_modules/SetupCxxFlags.cmake
index d3a2a1a2d2..cdaafe379b 100644
--- a/cpp/cmake_modules/SetupCxxFlags.cmake
+++ b/cpp/cmake_modules/SetupCxxFlags.cmake
@@ -118,12 +118,16 @@ if(NOT DEFINED CMAKE_C_STANDARD)
set(CMAKE_C_STANDARD 11)
endif()
-# This ensures that things like c++11 get passed correctly
+# This ensures that things like c++11/c++14 get passed correctly
if(NOT DEFINED CMAKE_CXX_STANDARD)
- set(CMAKE_CXX_STANDARD 11)
+ if(ARROW_AZURE)
+ set(CMAKE_CXX_STANDARD 14)
+ else()
+ set(CMAKE_CXX_STANDARD 11)
+ endif()
endif()
-# We require a C++11 compliant compiler
+# We require a C++11/14 compliant compiler
set(CMAKE_CXX_STANDARD_REQUIRED ON)
# ARROW-6848: Do not use GNU (or other CXX) extensions
diff --git a/cpp/src/arrow/CMakeLists.txt b/cpp/src/arrow/CMakeLists.txt
index ec6cada1cd..1ded8e59d4 100644
--- a/cpp/src/arrow/CMakeLists.txt
+++ b/cpp/src/arrow/CMakeLists.txt
@@ -469,6 +469,12 @@ if(ARROW_FILESYSTEM)
filesystem/path_util.cc
filesystem/util_internal.cc)
+ if(ARROW_AZURE)
+ list(APPEND ARROW_SRCS filesystem/azurefs.cc filesystem/azurefs_mock.cc)
+ set_source_files_properties(filesystem/azurefs.cc filesystem/azurefs_mock.cc
+ PROPERTIES SKIP_PRECOMPILE_HEADERS ON
+ SKIP_UNITY_BUILD_INCLUSION ON)
+ endif()
if(ARROW_GCS)
list(APPEND ARROW_SRCS filesystem/gcsfs.cc filesystem/gcsfs_internal.cc)
set_source_files_properties(filesystem/gcsfs.cc filesystem/gcsfs_internal.cc
diff --git a/cpp/src/arrow/filesystem/CMakeLists.txt b/cpp/src/arrow/filesystem/CMakeLists.txt
index 819eca08cf..bbca231baf 100644
--- a/cpp/src/arrow/filesystem/CMakeLists.txt
+++ b/cpp/src/arrow/filesystem/CMakeLists.txt
@@ -28,8 +28,8 @@ add_arrow_test(filesystem-test
EXTRA_LABELS
filesystem)
-if(ARROW_GCS)
- add_arrow_test(gcsfs_test
+if(ARROW_AZURE)
+ add_arrow_test(azurefs_test
EXTRA_LABELS
filesystem
EXTRA_LINK_LIBS
@@ -37,32 +37,13 @@ if(ARROW_GCS)
Boost::system)
endif()
-if(ARROW_AZURE)
- set(AZURE_SRCS)
- list(APPEND
- AZURE_SRCS
- azurefs_mock.cc
- azurefs.cc)
-
- add_arrow_lib(azurefs
- SOURCES
- ${AZURE_SRCS}
- SHARED_LINK_LIBS
- ${ARROW_LINK_LIBS}
- SHARED_PRIVATE_LINK_LIBS
- ${ARROW_SHARED_PRIVATE_LINK_LIBS}
- STATIC_LINK_LIBS
- ${ARROW_STATIC_LINK_LIBS})
-
- set_target_properties(azurefs_objlib PROPERTIES CXX_STANDARD 14 CXX_STANDARD_REQUIRED ON)
-
- set(TEST_LIBS_AZURE ${ARROW_TEST_LINK_LIBS})
- list(APPEND TEST_LIBS_AZURE azurefs_shared)
- add_arrow_test(azurefs_test EXTRA_LABELS filesystem
- STATIC_LINK_LIBS
- ${TEST_LIBS_AZURE}
- )
- set_target_properties(arrow-azurefs-test PROPERTIES CXX_STANDARD 14 CXX_STANDARD_REQUIRED ON)
+if(ARROW_GCS)
+ add_arrow_test(gcsfs_test
+ EXTRA_LABELS
+ filesystem
+ EXTRA_LINK_LIBS
+ Boost::filesystem
+ Boost::system)
endif()
if(ARROW_S3)There was a problem hiding this comment. If we change the default C++ version, then it will pick C++14 for the entire compilation, and looks like from this conversation - https://issues.apache.org/jira/browse/ARROW-2034?focusedCommentId=17463318&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-17463318, it is not desired, right? There was a problem hiding this comment. I think that @pitrou said that we can use C++14 features in There was a problem hiding this comment. Right. Also, |
||
|
|
||
| set(TEST_LIBS_AZURE ${ARROW_TEST_LINK_LIBS}) | ||
| list(APPEND TEST_LIBS_AZURE azurefs_shared) | ||
| add_arrow_test(azurefs_test EXTRA_LABELS filesystem | ||
| STATIC_LINK_LIBS | ||
| ${TEST_LIBS_AZURE} | ||
| ) | ||
| set_target_properties(arrow-azurefs-test PROPERTIES CXX_STANDARD 14 CXX_STANDARD_REQUIRED ON) | ||
| endif() | ||
|
|
||
| if(ARROW_S3) | ||
| add_arrow_test(s3fs_test | ||
| SOURCES | ||
|
|
||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you keep this list in alphabetical order?