SNOW-983098: redo arrow update 15.0.0 (#708)

snowflakedb · Apr 23, 2024 · 8a38e7f · 8a38e7f
1 parent 7e701ff
commit 8a38e7f
Show file tree

Hide file tree

Showing 22 changed files with 27 additions and 30 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -70,15 +70,14 @@ set(CMAKE_VERBOSE_MAKEFILE ON)
 if (UNIX)
     # Linux and OSX
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -std=gnu99 -g -fPIC -Werror -Wno-error=deprecated-declarations -D_LARGEFILE64_SOURCE ${MOCK_OBJECT_WRAPPER_FLAGS}")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -std=gnu++14 -fPIC -Werror -Wno-error=deprecated-declarations ${MOCK_OBJECT_WRAPPER_FLAGS}")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -std=gnu++17 -fPIC -Werror -Wno-error=deprecated-declarations ${MOCK_OBJECT_WRAPPER_FLAGS}")
 else()
     # Windows
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /ZH:SHA_256 /guard:cf /Qspectre /sdl")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /ZH:SHA_256 /guard:cf /Qspectre /sdl")
-# comment out for later use when updating arrow to 15.x
-#    if ($ENV{ARROW_FROM_SOURCE})
-#        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++17 /D_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING")
-#    endif ()
+    if ($ENV{ARROW_FROM_SOURCE})
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++17 /D_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING")
+    endif ()
 endif ()
 if (LINUX)
     # Linux. MacOS doesn't require pthread option

diff --git a/ci/_init.sh b/ci/_init.sh
@@ -15,8 +15,7 @@ fi
 export DRIVER_NAME=libsnowflakeclient
 
 # Build images
-# We have build image version 2 with gcc8 already but stay on old one with gcc5 for now
-BUILD_IMAGE_VERSION_X64=1
+BUILD_IMAGE_VERSION_X64=2
 BUILD_IMAGE_VERSION_AARCH64=3
 
 # Test Images

diff --git a/scripts/_init.bat b/scripts/_init.bat
@@ -14,8 +14,7 @@ if /I "%platform%"=="x64" set platform=x64
 if /I "%platform%"=="x86" set platform=x86
 
 set curdir=%cd%
-:: use old arrow for now
-::set ARROW_FROM_SOURCE=1
+set ARROW_FROM_SOURCE=1
 
 if defined arch (
     if not "%platform%"=="" (

diff --git a/scripts/build_arrow.bat b/scripts/build_arrow.bat
@@ -2,7 +2,7 @@
 :: Build ARROW library
 ::
 @echo off
-set arrow_src_version=0.17.1
+set arrow_src_version=15.0.0
 set arrow_build_version=3
 :: The full version number for dependency packaging/uploading/downloading
 if "%ARROW_FROM_SOURCE%"=="1" (

diff --git a/scripts/build_arrow.sh b/scripts/build_arrow.sh
@@ -11,7 +11,7 @@ function usage() {
 }
 set -o pipefail
 
-export ARROW_SRC_VERSION=0.17.1
+export ARROW_SRC_VERSION=15.0.0
 export ARROW_BUILD_VERSION=3
 #The full version number for dependency packaging/uploading/downloading
 export ARROW_VERSION=${ARROW_SRC_VERSION}.${ARROW_BUILD_VERSION}

diff --git a/scripts/build_awssdk.bat b/scripts/build_awssdk.bat
@@ -4,7 +4,7 @@
 ::
 @echo off
 set aws_src_version=1.11.283
-set aws_build_version=5
+set aws_build_version=6
 set aws_version=%aws_src_version%.%aws_build_version%
 call %*
 goto :EOF

diff --git a/scripts/build_awssdk.sh b/scripts/build_awssdk.sh
@@ -13,7 +13,7 @@ function usage() {
 set -o pipefail
 
 AWS_SRC_VERSION=1.11.283
-AWS_BUILD_VERSION=5
+AWS_BUILD_VERSION=6
 AWS_DIR=aws-sdk-cpp-$AWS_SRC_VERSION
 AWS_VERSION=$AWS_SRC_VERSION.$AWS_BUILD_VERSION
 

diff --git a/scripts/build_azuresdk.bat b/scripts/build_azuresdk.bat
@@ -4,7 +4,7 @@
 ::
 @echo off
 set azure_src_version=0.1.20
-set azure_build_version=10
+set azure_build_version=11
 set azure_version=%azure_src_version%.%azure_build_version%
 call %*
 goto :EOF

diff --git a/scripts/build_azuresdk.sh b/scripts/build_azuresdk.sh
@@ -12,7 +12,7 @@ function usage() {
 set -o pipefail
 
 AZURE_SRC_VERSION=0.1.20
-AZURE_BUILD_VERSION=10
+AZURE_BUILD_VERSION=11
 AZURE_DIR=azure-storage-cpplite-$AZURE_SRC_VERSION
 AZURE_VERSION=$AZURE_SRC_VERSION.$AZURE_BUILD_VERSION
 

diff --git a/scripts/build_boost_source.bat b/scripts/build_boost_source.bat
@@ -3,7 +3,7 @@
 :: GitHub repo: https://github.com/boostorg/boost.git
 ::
 @echo off
-set boost_version=1.75.0
+set boost_version=1.81.0
 call %*
 goto :EOF
 

diff --git a/scripts/build_boost_source.sh b/scripts/build_boost_source.sh
@@ -11,7 +11,7 @@ function usage() {
 }
 set -o pipefail
 
-BOOST_VERSION=1.75.0
+BOOST_VERSION=1.81.0
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 source $DIR/_init.sh $@
@@ -38,8 +38,8 @@ sed -i -- 's/build.sh)/build.sh gcc)/g' bootstrap.sh
 # If we are not doing a universal build, build with 64-bit
 if [[ "$PLATFORM" == "darwin" ]] && [[ "$ARCH" == "universal" ]]; then
     CXX=$CXX ./bootstrap.sh --prefix=. --with-toolset=clang --with-libraries=filesystem,regex,system cxxflags="-arch x86_64 -arch arm64" cflags="-arch x86_64 -arch arm64" linkflags="-arch x86_64 -arch arm64"
-    ./b2 stage --stagedir=$BOOST_BUILD_DIR/x64 --includedir=$BOOST_BUILD_DIR/include toolset=clang target-os=darwin architecture=x86 variant=$VARIANT link=static address-model=64 cflags="-Wall -D_REENTRANT -DCLUNIX -fPIC -O3 -arch x86_64" cxxflags="-arch x86_64" linkflags="-arch x86_64" -a install
-    ./b2 stage --stagedir=$BOOST_BUILD_DIR/arm64 toolset=clang variant=$VARIANT link=static address-model=64 cflags="-Wall -D_REENTRANT -DCLUNIX -fPIC -O3 -arch arm64" cxxflags="-arch arm64" linkflags="-arch arm64" -a install
+    ./b2 stage --stagedir=$BOOST_BUILD_DIR/x64 --includedir=$BOOST_BUILD_DIR/include toolset=clang target-os=darwin architecture=x86 variant=$VARIANT link=static address-model=64 cflags="-Wall -D_REENTRANT -DCLUNIX -fPIC -O3 -arch x86_64" cxxflags="-arch x86_64 -DBOOST_REGEX_MAX_CACHE_BLOCKS=0" linkflags="-arch x86_64" -a install
+    ./b2 stage --stagedir=$BOOST_BUILD_DIR/arm64 toolset=clang variant=$VARIANT link=static address-model=64 cflags="-Wall -D_REENTRANT -DCLUNIX -fPIC -O3 -arch arm64" cxxflags="-arch arm64 -DBOOST_REGEX_MAX_CACHE_BLOCKS=0" linkflags="-arch arm64" -a install
     mkdir $BOOST_BUILD_DIR/lib
     for static_lib in $BOOST_BUILD_DIR/x64/lib/*.a; do
         lipo -create -arch x86_64 $static_lib -arch arm64 $BOOST_BUILD_DIR/arm64/lib/$(basename $static_lib) -output $BOOST_BUILD_DIR/lib/$(basename $static_lib);

diff --git a/scripts/build_cmocka.bat b/scripts/build_cmocka.bat
@@ -4,7 +4,7 @@
 ::
 @echo off
 set cmocka_src_version=1.1.1
-set cmocka_build_version=3
+set cmocka_build_version=4
 set cmocka_version=%cmocka_src_version%.%cmocka_build_version%
 call %*
 goto :EOF

diff --git a/scripts/build_cmocka.sh b/scripts/build_cmocka.sh
@@ -14,7 +14,7 @@ function usage() {
 set -o pipefail
 
 CMOCKA_SRC_VERSION=1.1.1
-CMOCKA_BUILD_VERSION=3
+CMOCKA_BUILD_VERSION=4
 CMOCKA_VERSION=$CMOCKA_SRC_VERSION.$CMOCKA_BUILD_VERSION
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

diff --git a/scripts/build_curl.bat b/scripts/build_curl.bat
@@ -11,7 +11,7 @@
 
 @echo off
 set CURL_SRC_VERSION=8.7.1
-set CURL_BUILD_VERSION=1
+set CURL_BUILD_VERSION=2
 set CURL_VERSION=%CURL_SRC_VERSION%.%CURL_BUILD_VERSION%
 call %*
 goto :EOF

diff --git a/scripts/build_curl.sh b/scripts/build_curl.sh
@@ -13,7 +13,7 @@ function usage() {
 set -o pipefail
 
 CURL_SRC_VERSION=8.7.1
-CURL_BUILD_VERSION=1
+CURL_BUILD_VERSION=2
 CURL_VERSION=${CURL_SRC_VERSION}.${CURL_BUILD_VERSION}
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

diff --git a/scripts/build_oob.bat b/scripts/build_oob.bat
@@ -3,7 +3,7 @@
 ::
 @echo off
 set OOB_SRC_VERSION=1.0.4
-set OOB_BUILD_VERSION=10
+set OOB_BUILD_VERSION=11
 set OOB_VERSION=%OOB_SRC_VERSION%.%OOB_BUILD_VERSION%
 call %*
 goto :EOF

diff --git a/scripts/build_oob.sh b/scripts/build_oob.sh
@@ -12,7 +12,7 @@ function usage() {
 set -o pipefail
 
 OOB_SRC_VERSION=1.0.4
-OOB_BUILD_VERSION=10
+OOB_BUILD_VERSION=11
 OOB_VERSION=$OOB_SRC_VERSION.$OOB_BUILD_VERSION
 UUID_VERSION=2.39.0
 

diff --git a/scripts/build_openssl.bat b/scripts/build_openssl.bat
@@ -11,7 +11,7 @@
 
 @echo off
 set OPENSSL_SRC_VERSION=3.0.13
-set OPENSSL_BUILD_VERSION=3
+set OPENSSL_BUILD_VERSION=4
 set OPENSSL_VERSION=%OPENSSL_SRC_VERSION%.%OPENSSL_BUILD_VERSION%
 call %*
 goto :EOF

diff --git a/scripts/build_openssl.sh b/scripts/build_openssl.sh
@@ -13,7 +13,7 @@ function usage() {
 set -o pipefail
 
 OPENSSL_SRC_VERSION=3.0.13
-OPENSSL_BUILD_VERSION=3
+OPENSSL_BUILD_VERSION=4
 OPENSSL_VERSION=$OPENSSL_SRC_VERSION.$OPENSSL_BUILD_VERSION
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

diff --git a/scripts/build_uuid.sh b/scripts/build_uuid.sh
@@ -15,7 +15,7 @@ function usage() {
 
 set -o pipefail
 UUID_SRC_VERSION=2.39.0
-UUID_BUILD_VERSION=2
+UUID_BUILD_VERSION=3
 UUID_VERSION=$UUID_SRC_VERSION.$UUID_BUILD_VERSION
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

diff --git a/scripts/build_zlib.bat b/scripts/build_zlib.bat
@@ -11,7 +11,7 @@
 ::
 @echo off
 set ZLIB_SRC_VERSION=1.3.1
-set ZLIB_BUILD_VERSION=4
+set ZLIB_BUILD_VERSION=5
 set ZLIB_VERSION=%ZLIB_SRC_VERSION%.%ZLIB_BUILD_VERSION%
 call %*
 goto :EOF

diff --git a/scripts/build_zlib.sh b/scripts/build_zlib.sh
@@ -13,7 +13,7 @@ function usage() {
 set -o pipefail
 
 ZLIB_SRC_VERSION=1.3.1
-ZLIB_BUILD_VERSION=4
+ZLIB_BUILD_VERSION=5
 ZLIB_VERSION=$ZLIB_SRC_VERSION.$ZLIB_BUILD_VERSION
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"