SNOW-1865263 Remove VS14 support in libsnowflakeclient

.gitignore

@@ -1,6 +1,6 @@
 *.swp
 .deps
-build/
+deps-build/
 *.lo
 *.la
 .libs

CMakeLists.txt

@@ -4,6 +4,11 @@
 #
 cmake_minimum_required(VERSION 3.17)
 project(snowflakeclient)
+
+option(BUILD_TESTS "True if build tests" on)
+option(MOCK "True if mock should be used" off)
+option(ARROW_FROM_SOURCE "Build Apache Arrow library from source" on)
+
 include(cmake/platform.cmake)
 include(cmake/flags.cmake)
 
@@ -13,8 +18,6 @@ enable_testing()
 
 add_compile_definitions(LOG_USE_COLOR)
 
-option(BUILD_TESTS "True if build tests" on)
-option(MOCK "True if mock should be used" off)
 set(OPENSSL_VERSION_NUMBER  0x11100000L)
 
 # Developers can uncomment this to enable mock builds on their local VMs
@@ -229,7 +232,7 @@ if (UNIX)
     find_library(BOOST_REGEX_LIB libboost_regex.a PATHS deps-build/${PLATFORM}/${CMAKE_BUILD_TYPE}/boost/lib/ REQUIRED NO_DEFAULT_PATH)
     find_library(BOOST_SYSTEM_LIB libboost_system.a PATHS deps-build/${PLATFORM}/${CMAKE_BUILD_TYPE}/boost/lib/ REQUIRED NO_DEFAULT_PATH)
     find_library(ARROW_JEMALLOCPIC_LIB libjemalloc_pic.a PATHS deps-build/${PLATFORM}/${CMAKE_BUILD_TYPE}/arrow_deps/lib/ REQUIRED NO_DEFAULT_PATH)
-    if ($ENV{ARROW_FROM_SOURCE})
+    if (ARROW_FROM_SOURCE)
     else()
         find_library(ARROW_FLATBUFFERS_LIB libflatbuffers.a PATHS deps-build/${PLATFORM}/${CMAKE_BUILD_TYPE}/arrow_deps/lib/ REQUIRED NO_DEFAULT_PATH)
         find_library(ARROW_GFLAGS_LIB libgflags.a PATHS deps-build/${PLATFORM}/${CMAKE_BUILD_TYPE}/arrow_deps/lib/ REQUIRED NO_DEFAULT_PATH)
@@ -291,7 +294,7 @@ if (WIN32)
     find_library(AWS_C_S3_LIB aws-c-s3.lib PATHS deps-build/${PLATFORM}/${VSDIR}/${CMAKE_BUILD_TYPE}/aws/lib/ REQUIRED NO_DEFAULT_PATH)
     find_library(AWS_C_SDKUTILS_LIB aws-c-sdkutils.lib PATHS deps-build/${PLATFORM}/${VSDIR}/${CMAKE_BUILD_TYPE}/aws/lib/ REQUIRED NO_DEFAULT_PATH)
     find_library(AZURE_STORAGE_LITE_LIB azure-storage-lite.lib PATHS deps-build/${PLATFORM}/${VSDIR}/${CMAKE_BUILD_TYPE}/azure/lib/ REQUIRED NO_DEFAULT_PATH)
-	if ($ENV{ARROW_FROM_SOURCE})
+	if (ARROW_FROM_SOURCE)
         find_library(BOOST_FILESYSTEM_LIB libboost_filesystem.lib PATHS deps-build/${PLATFORM}/${VSDIR}/${CMAKE_BUILD_TYPE}/boost/lib/ REQUIRED NO_DEFAULT_PATH)
         find_library(BOOST_REGEX_LIB libboost_regex.lib PATHS deps-build/${PLATFORM}/${VSDIR}/${CMAKE_BUILD_TYPE}/boost/lib/ REQUIRED NO_DEFAULT_PATH)
         find_library(BOOST_SYSTEM_LIB libboost_system.lib PATHS deps-build/${PLATFORM}/${VSDIR}/${CMAKE_BUILD_TYPE}/boost/lib/ REQUIRED NO_DEFAULT_PATH)
@@ -309,7 +312,7 @@ if (WIN32)
     endif()
     # No arrow on Win-32bit
     if (CMAKE_SIZEOF_VOID_P EQUAL 8)
-        if ($ENV{ARROW_FROM_SOURCE})
+        if (ARROW_FROM_SOURCE)
             find_library(ARROW_ARROW_LIB arrow_static.lib PATHS deps-build/${PLATFORM}/${VSDIR}/${CMAKE_BUILD_TYPE}/arrow/lib/ REQUIRED NO_DEFAULT_PATH)
         else()
             find_library(ARROW_ARROW_LIB arrow.lib PATHS deps-build/${PLATFORM}/${VSDIR}/${CMAKE_BUILD_TYPE}/arrow/lib/ REQUIRED NO_DEFAULT_PATH)

Jenkinsfile

@@ -19,9 +19,7 @@ timestamps {
       def jobs = [
         'Linux' : { build job: 'LibSfClient-Linux-Release', parameters: params },
         'Linux-aarch64' : { build job: 'LibSfClient-Linux-aarch64-Release', parameters: params },
-        'Win32-VS14' : { build job: 'LibSfClient-Win32-VS14-Release', parameters: params },
         'Win32-VS17' : { build job: 'LibSfClient-Win32-VS17-Release', parameters: params },
-        'Win64-VS14' : { build job: 'LibSfClient-Win64-VS14-Release', parameters: params },
         'Win64-VS17' : { build job: 'LibSfClient-Win64-VS17-Release', parameters: params },
         'Macaarch64' : { build job: 'LibSfClient-Macaarch64-Universal-Release', parameters: params }
       ]

ci/build/build.sh

@@ -92,6 +92,7 @@ download_build_component curl "$SCRIPTS_DIR/build_curl.sh" "$target"
 download_build_component aws "$SCRIPTS_DIR/build_awssdk.sh" "$target"
 download_build_component azure "$SCRIPTS_DIR/build_azuresdk.sh" "$target"
 download_build_component cmocka "$SCRIPTS_DIR/build_cmocka.sh" "$target"
+download_build_component boost "$SCRIPTS_DIR/build_boost.sh" "$target"
 download_build_component arrow "$SCRIPTS_DIR/build_arrow.sh" "$target"
 download_build_component picojson "$SCRIPTS_DIR/build_picojson.sh" "$target"
 

ci/build_win.bat

@@ -25,6 +25,7 @@ set oob_build_script="%scriptdir%..\scripts\build_oob.bat"
 set aws_build_script="%scriptdir%..\scripts\build_awssdk.bat"
 set azure_build_script="%scriptdir%..\scripts\build_azuresdk.bat"
 set cmocka_build_script="%scriptdir%..\scripts\build_cmocka.bat"
+set boost_build_script="%scriptdir%..\scripts\build_boost.bat"
 set arrow_build_script="%scriptdir%..\scripts\build_arrow.bat"
 set picojson_build_script="%scriptdir%..\scripts\build_picojson.bat"
 set libsnowflakeclient_build_script="%scriptdir%..\scripts\build_libsnowflakeclient.bat"
@@ -58,6 +59,8 @@ goto :EOF
     if %ERRORLEVEL% NEQ 0 goto :error
     call :download_build_component cmocka "%cmocka_build_script%" "%dynamic_runtime%"
     if %ERRORLEVEL% NEQ 0 goto :error
+    call :download_build_component boost "%boost_build_script%" "%dynamic_runtime%"
+    if %ERRORLEVEL% NEQ 0 goto :error
     call :download_build_component arrow "%arrow_build_script%" "%dynamic_runtime%"
     if %ERRORLEVEL% NEQ 0 goto :error
     call :download_build_component picojson "%picojson_build_script%" "%dynamic_runtime%"
@@ -93,7 +96,7 @@ goto :EOF
             pushd deps-build\%arcdir%\%vsdir%\%build_type%
                 if !ERRORLEVEL! NEQ 0 goto :error
                 rd /s /q %component_name%
-                7z x "%curdir%\artifacts\%zip_file_name%"
+                7z x "%curdir%\artifacts\%zip_file_name%" -aos
             popd
         )
         if !ERRORLEVEL! NEQ 0 goto :error
@@ -122,7 +125,7 @@ goto :EOF
             pushd deps-build\%arcdir%\%vsdir%\%build_type%
                 if !ERRORLEVEL! NEQ 0 goto :error
                 rd /s /q %component_name%
-                7z x "%curdir%\artifacts\%zip_file_name%"
+                7z x "%curdir%\artifacts\%zip_file_name%" -aos
             popd
         )
     )
@@ -142,8 +145,6 @@ goto :EOF
 
     call %build_script% :get_version
     if defined JENKINS_URL (
-        :: Temporarily disable uploading of Arrow artifacts until we compile from source.
-        if "%component_name%"=="arrow" if not defined ARROW_FROM_SOURCE exit /b 0
         echo === uploading ...
         call %utils_script% :upload_to_sfc_jenkins %platform% %build_type% %vs_version% %component_name% %version%
         if !ERRORLEVEL! NEQ 0 goto :error

cmake/flags.cmake

@@ -12,9 +12,7 @@ if (UNIX)
 else()
     # Windows
     add_compile_options(/ZH:SHA_256 /guard:cf /Qspectre /sdl)
-    if ($ENV{ARROW_FROM_SOURCE})
-        add_compile_definitions(_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING BOOST_ALL_NO_LIB)
-    endif()
+    add_compile_definitions(_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING BOOST_ALL_NO_LIB)
 endif()
 
 if (LINUX)

scripts/_init.bat

@@ -14,7 +14,6 @@ if /I "%platform%"=="x64" set platform=x64
 if /I "%platform%"=="x86" set platform=x86
 
 set curdir=%cd%
-set ARROW_FROM_SOURCE=1
 
 if defined arch (
     if not "%platform%"=="" (
@@ -84,13 +83,8 @@ if /I "%vs_version%"=="VS15" (
     set cmake_generator=Visual Studio 15 2017
     set vsdir=vs15
 )
-if /I "%vs_version%"=="VS14" (
-    set cmake_generator=Visual Studio 14 2015
-    set vsdir=vs14
-    set ARROW_FROM_SOURCE=0
-)
 if "%cmake_generator%"=="" (
-    echo Specify the VS_VERSION to the Visual Studio Version [VS17, VS16, VS15, VS14]
+    echo Specify the VS_VERSION to the Visual Studio Version [VS17, VS16, VS15]
     goto :error
 )
 

scripts/_init.sh

@@ -105,15 +105,6 @@ fi
 
 export GCCVERSION="$($GCC --version | grep ^gcc | sed 's/^.* //g')"
 
-# Moving linux build to centos7 so ARROW_FROM_SOURCE should always
-# be turned on.
-# Keep ARROW_FROM_SOURCE for now in case we need to
-# disable it for some reason. Eventually will remove it when the
-# build on centos7 is stable.
-if [[ -z "$ARROW_FROM_SOURCE" ]]; then
-    export ARROW_FROM_SOURCE=1
-fi
-
 if [[ "$PLATFORM" == "darwin" ]]; then
     export CC=clang
     export CXX=clang++
@@ -143,6 +134,7 @@ export BUILD_WITH_PROFILE_OPTION=
 export BUILD_SOURCE_ONLY=
 export GET_VERSION=
 target=Release
+OPTIND=1
 while getopts ":hvpt:s" opt; do
   case $opt in
     t) target=$OPTARG ;;

scripts/build_arrow.bat

@@ -1,16 +1,12 @@
 ::
-:: Build ARROW library
+:: Build arrow
+:: GitHub repo: https://github.com/apache/arrow.git
 ::
 @echo off
 set arrow_src_version=15.0.0
-set arrow_build_version=6
+set arrow_build_version=7
 :: The full version number for dependency packaging/uploading/downloading
-if "%ARROW_FROM_SOURCE%"=="1" (
-    set arrow_version=%arrow_src_version%.%arrow_build_version%
-) else (
-:: Use pre-build package of 0.17.1
-    set arrow_version=0.17.1
-)
+set arrow_version=%arrow_src_version%.%arrow_build_version%
 
 call %*
 goto :EOF
@@ -20,7 +16,6 @@ goto :EOF
     goto :EOF
 
 :build
-@echo off
 setlocal
 set platform=%1
 set build_type=%2
@@ -30,26 +25,82 @@ set dynamic_runtime=%4
 set scriptdir=%~dp0
 call "%scriptdir%_init.bat" %platform% %build_type% %vs_version%
 if %ERRORLEVEL% NEQ 0 goto :error
+call "%scriptdir%utils.bat" :setup_visual_studio %vs_version%
+if %ERRORLEVEL% NEQ 0 goto :error
 
 set currdir=%cd%
-set dependencydir=%scriptdir%..\deps-build\
-cd %dependencydir%
-
-rd /S /Q %build_dir%\arrow
-rd /S /Q %build_dir%\arrow_deps
-rd /S /Q %build_dir%\boost
-if "%ARROW_FROM_SOURCE%"=="1" (
-    echo "%scriptdir%build_boost_source.bat"
-    call "%scriptdir%build_boost_source.bat" :build %platform% %build_type% %vs_version% %dynamic_runtime%
-	if %ERRORLEVEL% NEQ 0 goto :error
-	if /I "%platform%"=="x64" (
-        call "%scriptdir%build_arrow_source.bat" :build %platform% %build_type% %vs_version% %dynamic_runtime%
-        if %ERRORLEVEL% NEQ 0 goto :error
-    )
+
+if /I "%platform%"=="x64" (
+    set engine_dir=Program Files
+)
+if /I "%platform%"=="x86" (
+    set engine_dir=Program Files (x86^)
+)
+
+set ARROW_SOURCE_DIR=%scriptdir%..\deps\arrow-%arrow_src_version%
+set ARROW_CMAKE_BUILD_DIR=%ARROW_SOURCE_DIR%\cpp\cmake-build-%arcdir%-%vs_version%-%build_type%
+set DEPENDENCY_DIR=%scriptdir%..\deps-build\%build_dir%
+set ARROW_INSTALL_DIR=%DEPENDENCY_DIR%\arrow
+set ARROW_DEPS_INSTALL_DIR=%DEPENDENCY_DIR%\arrow_deps
+
+rd /S /Q %ARROW_CMAKE_BUILD_DIR%
+md %ARROW_CMAKE_BUILD_DIR%
+rd /S /Q %ARROW_INSTALL_DIR%
+md %ARROW_INSTALL_DIR%
+rd /S /Q %ARROW_DEPS_INSTALL_DIR%
+md %ARROW_DEPS_INSTALL_DIR%
+cd %ARROW_CMAKE_BUILD_DIR%
+
+set runtimelink=MultiThreaded
+if /I "%build_type%"=="debug" (
+    set debugging=on
+	set variant=debug
+	set runtimelink=%runtimelink%Debug
 ) else (
-    :: Temporarily hard-code vsdir in Arrow archive to vs14.
-    7z x arrow_%arcdir%_vs14_%build_type%-0.17.1.zip -o%build_dir%
+    set debugging=off
+	set variant=release
+)
+
+if /I "%dynamic_runtime%"=="on" (
+	set runtimelink=%runtimelink%DLL
 )
+
+cmake ..\ ^
+-G "%cmake_generator%" -A "%cmake_architecture%" ^
+-DCMAKE_BUILD_TYPE=%build_type% ^
+-DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF ^
+-DCMAKE_INSTALL_PREFIX=%ARROW_INSTALL_DIR% ^
+-DCMAKE_MSVC_RUNTIME_LIBRARY=%runtimelink% ^
+-DCMAKE_C_FLAGS="/guard:cf /Z7 /ZH:SHA_256 /Qspectre /sdl" ^
+-DCMAKE_CXX_FLAGS="/std:c++17 /guard:cf /Z7 /ZH:SHA_256 /Qspectre /sdl" ^
+-DARROW_USE_STATIC_CRT=ON ^
+-DARROW_BOOST_USE_SHARED=OFF ^
+-DARROW_BUILD_SHARED=OFF ^
+-DARROW_BUILD_STATIC=ON ^
+-DBOOST_SOURCE=SYSTEM ^
+-DARROW_WITH_BROTLI=OFF ^
+-DARROW_WITH_LZ4=OFF ^
+-DARROW_WITH_SNAPPY=OFF ^
+-DARROW_WITH_ZLIB=OFF ^
+-DARROW_JSON=OFF ^
+-DARROW_DATASET=OFF ^
+-DARROW_BUILD_UTILITIES=OFF ^
+-DARROW_COMPUTE=OFF ^
+-DARROW_FILESYSTEM=OFF ^
+-DARROW_USE_GLOG=OFF ^
+-DARROW_HDFS=OFF ^
+-DARROW_WITH_BACKTRACE=OFF ^
+-DARROW_JEMALLOC_USE_SHARED=OFF ^
+-DARROW_BUILD_TESTS=OFF ^
+-DBoost_INCLUDE_DIR=%DEPENDENCY_DIR%\boost\include ^
+-DBOOST_SYSTEM_LIBRARY=%DEPENDENCY_DIR%\boost\lib\libboost_system.lib ^
+-DBOOST_FILESYSTEM_LIBRARY=%DEPENDENCY_DIR%\boost\lib\libboost_filesystem.lib
+
+if %ERRORLEVEL% NEQ 0 goto :error
+
+msbuild INSTALL.vcxproj /p:Configuration=%build_type%
+if %ERRORLEVEL% NEQ 0 goto :error
+
 if defined GITHUB_ACTIONS (
     del %dependencydir%\*.zip
     del %dependencydir%\*.gz
@@ -58,7 +109,7 @@ if defined GITHUB_ACTIONS (
 cd "%currdir%"
 
 echo === archiving the library
-call "%scriptdir%utils.bat" :zip_files arrow %arrow_version% "arrow arrow_deps boost"
+call "%scriptdir%utils.bat" :zip_files arrow %arrow_version% "arrow arrow_deps"
 if %ERRORLEVEL% NEQ 0 goto :error
 
 goto :success