Merge branch 'master' into develop

Author: nautaa

CMakeLists.txt

@@ -5,14 +5,14 @@ include(cmake/Env.cmake)
 
 if(OB_BUILD_OPENSOURCE)
   project("OceanBase_CE"
-    VERSION 4.3.5.0
+    VERSION 4.3.5.1
     DESCRIPTION "OceanBase distributed database system"
     HOMEPAGE_URL "https://open.oceanbase.com/"
     LANGUAGES CXX C ASM)
   message(STATUS "open source build enabled")
 else()
   project(OceanBase
-    VERSION 4.3.5.0
+    VERSION 4.3.5.1
     DESCRIPTION "OceanBase distributed database system"
     HOMEPAGE_URL "https://www.oceanbase.com/"
     LANGUAGES CXX C ASM)

build.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-TOPDIR=`readlink -f \`dirname $0\``
+TOPDIR=$(cd "$(dirname "$0")" && pwd)
 BUILD_SH=$TOPDIR/build.sh
 
 DEP_DIR=${TOPDIR}/deps/3rd/usr/local/oceanbase/deps/devel

cmake/Env.cmake

@@ -51,6 +51,9 @@ ob_define(OB_DISABLE_PIE OFF)
 ob_define(OB_ENABLE_MCMODEL OFF)
 
 ob_define(USE_LTO_CACHE OFF)
+# odps jni
+ob_define(OB_BUILD_JNI_ODPS ON)
+
 
 if(WITH_COVERAGE)
   # -ftest-coverage to generate .gcno file
@@ -143,6 +146,7 @@ if(OB_BUILD_CLOSE_MODULES)
   ob_define(OB_BUILD_DBLINK ON)
   # odps
   ob_define(OB_BUILD_CPP_ODPS ON)
+
   # 仲裁功能
   ob_define(OB_BUILD_ARBITRATION ON)
 
@@ -206,6 +210,10 @@ if(OB_BUILD_CPP_ODPS)
   add_definitions(-DOB_BUILD_CPP_ODPS)
 endif()
 
+if (OB_BUILD_JNI_ODPS)
+ add_definitions(-DOB_BUILD_JNI_ODPS)
+endif()
+
 # should not use initial-exec for tls-model if building OBCDC.
 if(BUILD_CDC_ONLY)
   add_definitions(-DOB_BUILD_CDC_DISABLE_VSAG)

cmake/Pack.cmake

@@ -353,16 +353,17 @@ if (NOT OB_BUILD_OPENSOURCE)
   endif()
 endif()
 
+## oceanbase-libs
+list(APPEND CPACK_COMPONENTS_ALL libs)
+install(PROGRAMS
+  deps/3rd/usr/local/oceanbase/deps/devel/lib/libaio.so.1
+  deps/3rd/usr/local/oceanbase/deps/devel/lib/libaio.so.1.0.1
+  deps/3rd/usr/local/oceanbase/deps/devel/lib/libaio.so
+  DESTINATION lib
+  COMPONENT libs
+)
+
 if(OB_BUILD_OPENSOURCE)
-  ## oceanbase-libs
-  list(APPEND CPACK_COMPONENTS_ALL libs)
-  install(PROGRAMS
-    deps/3rd/usr/local/oceanbase/deps/devel/lib/libaio.so.1
-    deps/3rd/usr/local/oceanbase/deps/devel/lib/libaio.so.1.0.1
-    deps/3rd/usr/local/oceanbase/deps/devel/lib/libaio.so
-    DESTINATION lib
-    COMPONENT libs
-  )
   if(OB_BUILD_OBADMIN)
     ## oceanbase-utils
     list(APPEND CPACK_COMPONENTS_ALL utils)

deps/init/dep_create.sh

@@ -295,7 +295,7 @@ do
         temp=$(echo "$line" | grep -Eo "target=(\S*)")
         [[ "$temp" != "" ]] && target_name=${temp#*=}
 
-  if [[ "$pkg" == *"obdevtools-llvm"* ]]; then
+  if [[ "$pkg" == *"obdevtools-llvm"* || "$pkg" == *"obdevtools-gcc"* ]]; then
     if [[ "$line" =~ cpp_standard=([0-9]+) ]]; then
       cpp_standard="${BASH_REMATCH[1]}"
       if [ "$cpp_standard" -ne "$CPP_STANDARD" ]; then

deps/init/oceanbase.al8.aarch64.deps

@@ -26,34 +26,37 @@ devdeps-oss-c-sdk-3.11.2-42024100915.al8.aarch64.rpm
 devdeps-zlib-static-1.2.13-82024102414.al8.aarch64.rpm
 devdeps-ncurses-static-6.2-112024092810.al8.aarch64.rpm
 devdeps-boost-1.74.0-72024092811.al8.aarch64.rpm
-devdeps-s2geometry-0.9.0-112024100811.al8.aarch64.rpm
+devdeps-abseil-cpp-20211102.0-62024122014.al8.aarch64.rpm
+devdeps-s2geometry-0.10.0-122024122617.al8.aarch64.rpm
 devdeps-icu-69.1-232024120517.al8.aarch64.rpm
 devdeps-cos-c-sdk-5.0.21-282024102810.al8.aarch64.rpm
 devdeps-s3-cpp-sdk-1.11.156-222024100811.al8.aarch64.rpm
 devdeps-protobuf-c-1.4.1-100000132024092815.al8.aarch64.rpm
 devdeps-roaringbitmap-croaring-3.0.0-92024092815.al8.aarch64.rpm
 devdeps-apache-arrow-9.0.0-562024092815.al8.aarch64.rpm
 devdeps-apache-orc-1.8.3-412024092817.al8.aarch64.rpm
-devdeps-vsag-1.0.0-312024101010.al8.aarch64.rpm
+devdeps-vsag-1.0.0-392024120610.al8.aarch64.rpm
 devdeps-fast-float-6.1.3-42024112122.al8.aarch64.rpm
+devdeps-hdfs-sdk-3.3.6-72024112119.al8.aarch64.rpm
 
 [tools]
 obdevtools-binutils-2.30-82024092619.al8.aarch64.rpm
 obdevtools-bison-2.4.1-42024092621.al8.aarch64.rpm
 obdevtools-ccache-3.7.12-52024092621.al8.aarch64.rpm
 obdevtools-cmake-3.22.1-122024092710.al8.aarch64.rpm
 obdevtools-flex-2.5.35-42024092621.al8.aarch64.rpm
-obdevtools-gcc9-9.3.0-152024092711.al8.aarch64.rpm
+obdevtools-gcc9-9.3.0-152024092711.al8.aarch64.rpm cpp_standard=11
+obdevtools-gcc-12.3.0-32024122017.al8.aarch64.rpm cpp_standard=20
 obdevtools-llvm-11.0.1-662024092811.al8.aarch64.rpm cpp_standard=11
 obdevtools-llvm-17.0.3-232024111415.al8.aarch64.rpm cpp_standard=20
 
 [tools-deps]
 devdeps-oblogmsg-1.1-122024093010.al8.aarch64.rpm
 obdevtools-obstack-2.0.4-42024101017.al8.aarch64.rpm
-devdeps-rocksdb-6.22.1.1-172024092818.al8.aarch64.rpm
-obshell-4.2.5.0-12024121011.al8.aarch64.rpm target=community
+devdeps-rocksdb-6.22.1-32024123015.al8.aarch64.rpm
+obshell-4.2.5.1-12025010214.al8.aarch64.rpm target=community
 
 [test-utils]
-ob-deploy-2.10.0-4.al8.aarch64.rpm target=community
+ob-deploy-3.0.1-1.al8.aarch64.rpm target=community
 obclient-2.2.3-202024102217.al8.aarch64.rpm target=community
 libobclient-2.2.3-152024102213.al8.aarch64.rpm target=community

deps/init/oceanbase.al8.x86_64.deps

@@ -27,7 +27,8 @@ devdeps-oss-c-sdk-3.11.2-42024100915.al8.x86_64.rpm
 devdeps-zlib-static-1.2.13-82024102414.al8.x86_64.rpm
 devdeps-ncurses-static-6.2-112024092810.al8.x86_64.rpm
 devdeps-boost-1.74.0-72024092811.al8.x86_64.rpm
-devdeps-s2geometry-0.9.0-112024100811.al8.x86_64.rpm
+devdeps-abseil-cpp-20211102.0-62024122014.al8.x86_64.rpm
+devdeps-s2geometry-0.10.0-122024122617.al8.x86_64.rpm
 devdeps-icu-69.1-232024120517.al8.x86_64.rpm
 devdeps-cloud-qpl-1.1.0-312024092814.al8.x86_64.rpm
 devdeps-cos-c-sdk-5.0.21-282024102810.al8.x86_64.rpm
@@ -37,26 +38,28 @@ devdeps-roaringbitmap-croaring-3.0.0-92024092815.al8.x86_64.rpm
 devdeps-apache-arrow-9.0.0-562024092815.al8.x86_64.rpm
 devdeps-hyperscan-5.4.2-252024092817.al8.x86_64.rpm
 devdeps-apache-orc-1.8.3-412024092817.al8.x86_64.rpm
-devdeps-vsag-1.0.0-312024101010.al8.x86_64.rpm
+devdeps-vsag-1.0.0-392024120610.al8.x86_64.rpm
 devdeps-fast-float-6.1.3-42024112122.al8.x86_64.rpm
+devdeps-hdfs-sdk-3.3.6-72024112119.al8.x86_64.rpm
 
 [tools]
 obdevtools-binutils-2.30-82024092619.al8.x86_64.rpm
 obdevtools-bison-2.4.1-42024092621.al8.x86_64.rpm
 obdevtools-ccache-3.7.12-52024092621.al8.x86_64.rpm
 obdevtools-cmake-3.22.1-122024092710.al8.x86_64.rpm
 obdevtools-flex-2.5.35-42024092621.al8.x86_64.rpm
-obdevtools-gcc9-9.3.0-152024092711.al8.x86_64.rpm
-obdevtools-llvm-11.0.1-312022092921.el8.x86_64.rpm cpp_standard=11
-obdevtools-llvm-17.0.3-232024111415.el8.x86_64.rpm cpp_standard=20
+obdevtools-gcc9-9.3.0-152024092711.al8.x86_64.rpm cpp_standard=11
+obdevtools-gcc-12.3.0-32024122017.al8.x86_64.rpm cpp_standard=20
+obdevtools-llvm-11.0.1-662024092811.al8.x86_64.rpm cpp_standard=11
+obdevtools-llvm-17.0.3-232024111415.al8.x86_64.rpm cpp_standard=20
 
 [tools-deps]
 devdeps-oblogmsg-1.1-122024093010.al8.x86_64.rpm
-devdeps-rocksdb-6.22.1.1-172024092818.al8.x86_64.rpm
+devdeps-rocksdb-6.22.1-32024123015.al8.x86_64.rpm
 obdevtools-obstack-2.0.4-42024101017.al8.x86_64.rpm
-obshell-4.2.5.0-12024121011.al8.x86_64.rpm target=community
+obshell-4.2.5.1-12025010214.al8.x86_64.rpm target=community
 
 [test-utils]
-ob-deploy-2.10.0-4.al8.x86_64.rpm target=community
+ob-deploy-3.0.1-1.al8.x86_64.rpm target=community
 obclient-2.2.3-202024102217.al8.x86_64.rpm target=community
 libobclient-2.2.3-152024102213.al8.x86_64.rpm target=community

deps/init/oceanbase.el7.aarch64.deps

@@ -26,34 +26,37 @@ devdeps-oss-c-sdk-3.11.2-42024100915.el7.aarch64.rpm
 devdeps-zlib-static-1.2.13-82024102414.el7.aarch64.rpm
 devdeps-ncurses-static-6.2-72022100815.el7.aarch64.rpm
 devdeps-boost-1.74.0-22022110914.el7.aarch64.rpm
-devdeps-s2geometry-0.9.0-12023092021.el7.aarch64.rpm
+devdeps-abseil-cpp-20211102.0-62024122014.el7.aarch64.rpm
+devdeps-s2geometry-0.10.0-122024122617.el7.aarch64.rpm
 devdeps-icu-69.1-72022112416.el7.aarch64.rpm
 devdeps-cos-c-sdk-5.0.21-202024080916.el7.aarch64.rpm
 devdeps-s3-cpp-sdk-1.11.156-102023122011.el7.aarch64.rpm
 devdeps-protobuf-c-1.4.1-100000072023102410.el7.aarch64.rpm
 devdeps-roaringbitmap-croaring-3.0.0-42024042816.el7.aarch64.rpm
 devdeps-apache-arrow-9.0.0-302024052920.el7.aarch64.rpm
 devdeps-apache-orc-1.8.3-392024091317.el7.aarch64.rpm
-devdeps-vsag-1.0.0-352024102510.el7.aarch64.rpm
+devdeps-vsag-1.0.0-392024120610.el7.aarch64.rpm
 devdeps-fast-float-6.1.3-42024112122.el7.aarch64.rpm
+devdeps-hdfs-sdk-3.3.6-72024112119.el7.aarch64.rpm
 
 [tools]
 obdevtools-binutils-2.30-12022100413.el7.aarch64.rpm
 obdevtools-bison-2.4.1-12022100413.el7.aarch64.rpm
 obdevtools-ccache-3.7.12-12022100417.el7.aarch64.rpm
 obdevtools-cmake-3.30.3-52024111819.el7.aarch64.rpm
 obdevtools-flex-2.5.35-12022100417.el7.aarch64.rpm
-obdevtools-gcc9-9.3.0-52022092914.el7.aarch64.rpm
+obdevtools-gcc9-9.3.0-52022092914.el7.aarch64.rpm cpp_standard=11
+obdevtools-gcc-12.3.0-32024122017.el7.aarch64.rpm cpp_standard=20
 obdevtools-llvm-11.0.1-312022092921.el7.aarch64.rpm cpp_standard=11
 obdevtools-llvm-17.0.3-232024111415.el7.aarch64.rpm cpp_standard=20
 
 [tools-deps]
 devdeps-oblogmsg-1.1-52024052811.el7.aarch64.rpm
-devdeps-rocksdb-6.22.1.1-52022100420.el7.aarch64.rpm
+devdeps-rocksdb-6.22.1-32024123015.el7.aarch64.rpm
 obstack-2.0.4-172024070513.el7.aarch64.rpm
-obshell-4.2.5.0-12024121011.el7.aarch64.rpm target=community
+obshell-4.2.5.1-12025010214.el7.aarch64.rpm target=community
 
 [test-utils]
-ob-deploy-2.10.0-3.el7.aarch64.rpm target=community
+ob-deploy-3.0.1-1.el7.aarch64.rpm target=community
 obclient-2.2.2-1.el7.aarch64.rpm target=community
 libobclient-2.2.2-3.el7.aarch64.rpm target=community

deps/init/oceanbase.el7.x86_64.deps

@@ -28,7 +28,8 @@ devdeps-oss-c-sdk-3.11.2-42024100915.el7.x86_64.rpm
 devdeps-zlib-static-1.2.13-82024102414.el7.x86_64.rpm
 devdeps-ncurses-static-6.2-72022100815.el7.x86_64.rpm
 devdeps-boost-1.74.0-22022110914.el7.x86_64.rpm
-devdeps-s2geometry-0.9.0-12023092021.el7.x86_64.rpm
+devdeps-abseil-cpp-20211102.0-62024122014.el7.x86_64.rpm
+devdeps-s2geometry-0.10.0-122024122617.el7.x86_64.rpm
 devdeps-icu-69.1-72022112416.el7.x86_64.rpm
 devdeps-cloud-qpl-1.1.0-272023061419.el7.x86_64.rpm
 devdeps-cos-c-sdk-5.0.21-202024080916.el7.x86_64.rpm
@@ -38,26 +39,28 @@ devdeps-roaringbitmap-croaring-3.0.0-42024042816.el7.x86_64.rpm
 devdeps-apache-arrow-9.0.0-222024052223.el7.x86_64.rpm
 devdeps-hyperscan-5.4.2-242024090219.el7.x86_64.rpm
 devdeps-apache-orc-1.8.3-392024091317.el7.x86_64.rpm
-devdeps-vsag-1.0.0-352024102510.el7.x86_64.rpm
+devdeps-vsag-1.0.0-392024120610.el7.x86_64.rpm
 devdeps-fast-float-6.1.3-42024112122.el7.x86_64.rpm
+devdeps-hdfs-sdk-3.3.6-72024112119.el7.x86_64.rpm
 
 [tools]
 obdevtools-binutils-2.30-12022100413.el7.x86_64.rpm
 obdevtools-bison-2.4.1-12022100413.el7.x86_64.rpm
 obdevtools-ccache-3.7.12-12022100417.el7.x86_64.rpm
 obdevtools-cmake-3.30.3-52024111819.el7.x86_64.rpm
 obdevtools-flex-2.5.35-12022100417.el7.x86_64.rpm
-obdevtools-gcc9-9.3.0-52022092914.el7.x86_64.rpm
+obdevtools-gcc9-9.3.0-52022092914.el7.x86_64.rpm cpp_standard=11
+obdevtools-gcc-12.3.0-32024122017.el7.x86_64.rpm cpp_standard=20
 obdevtools-llvm-11.0.1-312022092921.el7.x86_64.rpm cpp_standard=11
 obdevtools-llvm-17.0.3-232024111415.el7.x86_64.rpm cpp_standard=20
 
 [tools-deps]
 devdeps-oblogmsg-1.1-52024052811.el7.x86_64.rpm
-devdeps-rocksdb-6.22.1.1-52022100420.el7.x86_64.rpm
+devdeps-rocksdb-6.22.1-32024123015.el7.x86_64.rpm
 obstack-2.0.4-172024070513.el7.x86_64.rpm
-obshell-4.2.5.0-12024121011.el7.x86_64.rpm target=community
+obshell-4.2.5.1-12025010214.el7.x86_64.rpm target=community
 
 [test-utils]
-ob-deploy-2.10.0-3.el7.x86_64.rpm target=community
+ob-deploy-3.0.1-1.el7.x86_64.rpm target=community
 obclient-2.2.2-1.el7.x86_64.rpm target=community
 libobclient-2.2.2-3.el7.x86_64.rpm target=community

deps/init/oceanbase.el8.aarch64.deps

@@ -26,34 +26,37 @@ devdeps-oss-c-sdk-3.11.2-42024100915.el8.aarch64.rpm
 devdeps-zlib-static-1.2.13-82024102414.el8.aarch64.rpm
 devdeps-ncurses-static-6.2-72022100815.el8.aarch64.rpm
 devdeps-boost-1.74.0-22022110914.el8.aarch64.rpm
-devdeps-s2geometry-0.9.0-12023092021.el8.aarch64.rpm
+devdeps-abseil-cpp-20211102.0-62024122014.el8.aarch64.rpm
+devdeps-s2geometry-0.10.0-122024122617.el8.aarch64.rpm
 devdeps-icu-69.1-72022112416.el8.aarch64.rpm
 devdeps-cos-c-sdk-5.0.21-202024080916.el8.aarch64.rpm
 devdeps-s3-cpp-sdk-1.11.156-102023122011.el8.aarch64.rpm
 devdeps-protobuf-c-1.4.1-100000072023102410.el8.aarch64.rpm
 devdeps-roaringbitmap-croaring-3.0.0-42024042816.el8.aarch64.rpm
 devdeps-apache-arrow-9.0.0-322024052923.el8.aarch64.rpm
 devdeps-apache-orc-1.8.3-392024091317.el8.aarch64.rpm
-devdeps-vsag-1.0.0-352024102510.el8.aarch64.rpm
+devdeps-vsag-1.0.0-392024120610.el8.aarch64.rpm
 devdeps-fast-float-6.1.3-42024112122.el8.aarch64.rpm
+devdeps-hdfs-sdk-3.3.6-72024112119.el8.aarch64.rpm
 
 [tools]
 obdevtools-binutils-2.30-12022100413.el8.aarch64.rpm
 obdevtools-bison-2.4.1-12022100413.el8.aarch64.rpm
 obdevtools-ccache-3.7.12-12022100417.el8.aarch64.rpm
 obdevtools-cmake-3.30.3-52024111819.el8.aarch64.rpm
 obdevtools-flex-2.5.35-12022100417.el8.aarch64.rpm
-obdevtools-gcc9-9.3.0-52022092914.el8.aarch64.rpm
+obdevtools-gcc9-9.3.0-52022092914.el8.aarch64.rpm cpp_standard=11
+obdevtools-gcc-12.3.0-32024122017.el8.aarch64.rpm cpp_standard=20
 obdevtools-llvm-11.0.1-312022092921.el8.aarch64.rpm cpp_standard=11
 obdevtools-llvm-17.0.3-232024111415.el8.aarch64.rpm cpp_standard=20
 
 [tools-deps]
 devdeps-oblogmsg-1.1-52024052811.el8.aarch64.rpm
-devdeps-rocksdb-6.22.1.1-52022100420.el8.aarch64.rpm
+devdeps-rocksdb-6.22.1-32024123015.el8.aarch64.rpm
 obstack-2.0.4-172024070513.el8.aarch64.rpm
-obshell-4.2.5.0-12024121011.el8.aarch64.rpm target=community
+obshell-4.2.5.1-12025010214.el8.aarch64.rpm target=community
 
 [test-utils]
-ob-deploy-2.10.0-3.el8.aarch64.rpm target=community
+ob-deploy-3.0.1-1.el8.aarch64.rpm target=community
 obclient-2.2.2-1.el8.aarch64.rpm target=community
 libobclient-2.2.2-3.el8.aarch64.rpm target=community