cmake build

Author: ArnavBalyan

cpp/cmake_modules/ThirdpartyToolchain.cmake

@@ -49,6 +49,7 @@ set(ARROW_THIRDPARTY_DEPENDENCIES
     Boost
     Brotli
     BZip2
+    fsst
     c-ares
     gflags
     glog
@@ -183,6 +184,8 @@ macro(build_dependency DEPENDENCY_NAME)
     build_brotli()
   elseif("${DEPENDENCY_NAME}" STREQUAL "BZip2")
     build_bzip2()
+  elseif("${DEPENDENCY_NAME}" STREQUAL "fsst")
+    build_fsst()
   elseif("${DEPENDENCY_NAME}" STREQUAL "c-ares")
     build_cares()
   elseif("${DEPENDENCY_NAME}" STREQUAL "gflags")
@@ -382,6 +385,7 @@ endif()
 if(ARROW_PARQUET)
   set(ARROW_WITH_RAPIDJSON ON)
   set(ARROW_WITH_THRIFT ON)
+  set(ARROW_WITH_FSST ON)
 endif()
 
 if(ARROW_WITH_THRIFT)
@@ -637,6 +641,14 @@ else()
   )
 endif()
 
+if(DEFINED ENV{ARROW_FSST_URL})
+  set(FSST_SOURCE_URL "$ENV{ARROW_FSST_URL}")
+else()
+  set_urls(FSST_SOURCE_URL
+           "https://github.com/cwida/fsst/archive/${ARROW_FSST_BUILD_VERSION}.tar.gz"
+           "${THIRDPARTY_MIRROR_URL}/fsst-${ARROW_FSST_BUILD_VERSION}.tar.gz")
+endif()
+
 if(DEFINED ENV{ARROW_GBENCHMARK_URL})
   set(GBENCHMARK_SOURCE_URL "$ENV{ARROW_GBENCHMARK_URL}")
 else()
@@ -2604,6 +2616,29 @@ if(ARROW_USE_XSIMD)
   endif()
 endif()
 
+function(build_fsst)
+  message(STATUS "Building FSST from source using FetchContent")
+
+  fetchcontent_declare(fsst
+                       URL ${FSST_SOURCE_URL}
+                       URL_HASH "SHA256=${ARROW_FSST_BUILD_SHA256_CHECKSUM}")
+
+  prepare_fetchcontent()
+  fetchcontent_makeavailable(fsst)
+
+  set(ARROW_FSST_INCLUDE_DIR
+      "${fsst_SOURCE_DIR}"
+      CACHE INTERNAL "FSST include directory")
+  set(ARROW_FSST_SOURCES
+      "${fsst_SOURCE_DIR}/libfsst.cpp;${fsst_SOURCE_DIR}/fsst_avx512.cpp"
+      CACHE INTERNAL "FSST source files")
+  set(FSST_VENDORED TRUE CACHE INTERNAL "Whether FSST is built from source")
+endfunction()
+
+if(ARROW_WITH_FSST)
+  resolve_dependency(fsst IS_RUNTIME_DEPENDENCY FALSE)
+endif()
+
 macro(build_zlib)
   message(STATUS "Building ZLIB from source")
 

cpp/src/parquet/CMakeLists.txt

@@ -42,21 +42,25 @@ function(ADD_PARQUET_TEST REL_TEST_NAME)
                         ${ARGN})
 
   set(TEST_ARGUMENTS PREFIX "parquet" LABELS "parquet-tests")
+  set(_PARQUET_TEST_EXTRA_ARGS ${ARG_UNPARSED_ARGUMENTS})
+  if(PARQUET_TEST_EXTRA_INCLUDES)
+    list(APPEND _PARQUET_TEST_EXTRA_ARGS EXTRA_INCLUDES ${PARQUET_TEST_EXTRA_INCLUDES})
+  endif()
 
   if(ARROW_TEST_LINKAGE STREQUAL "static")
     add_test_case(${REL_TEST_NAME}
                   STATIC_LINK_LIBS
                   parquet_static
                   ${PARQUET_TEST_LINK_LIBS}
                   ${TEST_ARGUMENTS}
-                  ${ARG_UNPARSED_ARGUMENTS})
+                  ${_PARQUET_TEST_EXTRA_ARGS})
   else()
     add_test_case(${REL_TEST_NAME}
                   STATIC_LINK_LIBS
                   parquet_shared
                   ${PARQUET_TEST_LINK_LIBS}
                   ${TEST_ARGUMENTS}
-                  ${ARG_UNPARSED_ARGUMENTS})
+                  ${_PARQUET_TEST_EXTRA_ARGS})
   endif()
 endfunction()
 
@@ -134,6 +138,9 @@ elseif(NOT MSVC)
   list(APPEND PARQUET_TEST_LINK_LIBS ${CMAKE_DL_LIBS})
 endif()
 
+set(PARQUET_TEST_EXTRA_INCLUDES)
+set(PARQUET_PRIVATE_INCLUDE_DIRS)
+
 #
 # Generated Thrift sources
 set(PARQUET_THRIFT_SOURCE_DIR "${ARROW_SOURCE_DIR}/src/generated/")
@@ -171,8 +178,6 @@ set(PARQUET_SRCS
     encryption/internal_file_encryptor.cc
     exception.cc
     file_reader.cc
-    thirdparty/fsst/libfsst.cpp
-    thirdparty/fsst/fsst_avx512.cpp
     file_writer.cc
     geospatial/statistics.cc
     geospatial/util_internal.cc
@@ -193,6 +198,14 @@ set(PARQUET_SRCS
     stream_writer.cc
     types.cc)
 
+if(DEFINED ARROW_FSST_SOURCES)
+  list(APPEND PARQUET_SRCS ${ARROW_FSST_SOURCES})
+endif()
+if(DEFINED ARROW_FSST_INCLUDE_DIR)
+  list(APPEND PARQUET_PRIVATE_INCLUDE_DIRS ${ARROW_FSST_INCLUDE_DIR})
+  list(APPEND PARQUET_TEST_EXTRA_INCLUDES ${ARROW_FSST_INCLUDE_DIR})
+endif()
+
 if(ARROW_HAVE_RUNTIME_AVX2)
   # AVX2 is used as a proxy for BMI2.
   list(APPEND PARQUET_SRCS level_comparison_avx2.cc level_conversion_bmi2.cc)
@@ -308,6 +321,14 @@ add_arrow_lib(parquet
               STATIC_INSTALL_INTERFACE_LIBS
               ${PARQUET_STATIC_INSTALL_INTERFACE_LIBS})
 
+if(PARQUET_PRIVATE_INCLUDE_DIRS)
+  foreach(_parquet_target parquet_objlib parquet_shared parquet_static)
+    if(TARGET ${_parquet_target})
+      target_include_directories(${_parquet_target} PRIVATE ${PARQUET_PRIVATE_INCLUDE_DIRS})
+    endif()
+  endforeach()
+endif()
+
 if(WIN32 AND NOT (ARROW_TEST_LINKAGE STREQUAL "static"))
   add_library(parquet_test_support STATIC
               "${PARQUET_THRIFT_SOURCE_DIR}/parquet_types.cpp")

cpp/src/parquet/decoder.cc

@@ -53,7 +53,7 @@
 #include "parquet/exception.h"
 #include "parquet/platform.h"
 #include "parquet/schema.h"
-#include "parquet/thirdparty/fsst/fsst.h"
+#include "fsst.h"
 #include "parquet/types.h"
 
 #ifdef _MSC_VER

cpp/src/parquet/encoder.cc

@@ -50,7 +50,7 @@
 #include "parquet/exception.h"
 #include "parquet/platform.h"
 #include "parquet/schema.h"
-#include "parquet/thirdparty/fsst/fsst.h"
+#include "fsst.h"
 #include "parquet/types.h"
 
 #ifdef _MSC_VER

cpp/src/parquet/encoding_test.cc

@@ -53,7 +53,7 @@
 #include "parquet/platform.h"
 #include "parquet/schema.h"
 #include "parquet/test_util.h"
-#include "parquet/thirdparty/fsst/fsst.h"
+#include "fsst.h"
 #include "parquet/types.h"
 
 using arrow::default_memory_pool;