Skip to content

Commit 259ba2d

Browse files
committed
Merge branch 'master' into develop
2 parents 3960e22 + 58497d7 commit 259ba2d

File tree

1,570 files changed

+312056
-284658
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,570 files changed

+312056
-284658
lines changed

CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ include(cmake/Env.cmake)
55

66
if(OB_BUILD_OPENSOURCE)
77
project("OceanBase_CE"
8-
VERSION 4.3.5.0
8+
VERSION 4.3.5.1
99
DESCRIPTION "OceanBase distributed database system"
1010
HOMEPAGE_URL "https://open.oceanbase.com/"
1111
LANGUAGES CXX C ASM)
1212
message(STATUS "open source build enabled")
1313
else()
1414
project(OceanBase
15-
VERSION 4.3.5.0
15+
VERSION 4.3.5.1
1616
DESCRIPTION "OceanBase distributed database system"
1717
HOMEPAGE_URL "https://www.oceanbase.com/"
1818
LANGUAGES CXX C ASM)

build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
TOPDIR=`readlink -f \`dirname $0\``
3+
TOPDIR=$(cd "$(dirname "$0")" && pwd)
44
BUILD_SH=$TOPDIR/build.sh
55

66
DEP_DIR=${TOPDIR}/deps/3rd/usr/local/oceanbase/deps/devel

cmake/Env.cmake

+8
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ ob_define(OB_DISABLE_PIE OFF)
5151
ob_define(OB_ENABLE_MCMODEL OFF)
5252

5353
ob_define(USE_LTO_CACHE OFF)
54+
# odps jni
55+
ob_define(OB_BUILD_JNI_ODPS ON)
56+
5457

5558
if(WITH_COVERAGE)
5659
# -ftest-coverage to generate .gcno file
@@ -143,6 +146,7 @@ if(OB_BUILD_CLOSE_MODULES)
143146
ob_define(OB_BUILD_DBLINK ON)
144147
# odps
145148
ob_define(OB_BUILD_CPP_ODPS ON)
149+
146150
# 仲裁功能
147151
ob_define(OB_BUILD_ARBITRATION ON)
148152

@@ -206,6 +210,10 @@ if(OB_BUILD_CPP_ODPS)
206210
add_definitions(-DOB_BUILD_CPP_ODPS)
207211
endif()
208212

213+
if (OB_BUILD_JNI_ODPS)
214+
add_definitions(-DOB_BUILD_JNI_ODPS)
215+
endif()
216+
209217
# should not use initial-exec for tls-model if building OBCDC.
210218
if(BUILD_CDC_ONLY)
211219
add_definitions(-DOB_BUILD_CDC_DISABLE_VSAG)

cmake/Pack.cmake

+10-9
Original file line numberDiff line numberDiff line change
@@ -353,16 +353,17 @@ if (NOT OB_BUILD_OPENSOURCE)
353353
endif()
354354
endif()
355355

356+
## oceanbase-libs
357+
list(APPEND CPACK_COMPONENTS_ALL libs)
358+
install(PROGRAMS
359+
deps/3rd/usr/local/oceanbase/deps/devel/lib/libaio.so.1
360+
deps/3rd/usr/local/oceanbase/deps/devel/lib/libaio.so.1.0.1
361+
deps/3rd/usr/local/oceanbase/deps/devel/lib/libaio.so
362+
DESTINATION lib
363+
COMPONENT libs
364+
)
365+
356366
if(OB_BUILD_OPENSOURCE)
357-
## oceanbase-libs
358-
list(APPEND CPACK_COMPONENTS_ALL libs)
359-
install(PROGRAMS
360-
deps/3rd/usr/local/oceanbase/deps/devel/lib/libaio.so.1
361-
deps/3rd/usr/local/oceanbase/deps/devel/lib/libaio.so.1.0.1
362-
deps/3rd/usr/local/oceanbase/deps/devel/lib/libaio.so
363-
DESTINATION lib
364-
COMPONENT libs
365-
)
366367
if(OB_BUILD_OBADMIN)
367368
## oceanbase-utils
368369
list(APPEND CPACK_COMPONENTS_ALL utils)

deps/init/dep_create.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ do
295295
temp=$(echo "$line" | grep -Eo "target=(\S*)")
296296
[[ "$temp" != "" ]] && target_name=${temp#*=}
297297

298-
if [[ "$pkg" == *"obdevtools-llvm"* ]]; then
298+
if [[ "$pkg" == *"obdevtools-llvm"* || "$pkg" == *"obdevtools-gcc"* ]]; then
299299
if [[ "$line" =~ cpp_standard=([0-9]+) ]]; then
300300
cpp_standard="${BASH_REMATCH[1]}"
301301
if [ "$cpp_standard" -ne "$CPP_STANDARD" ]; then

deps/init/oceanbase.al8.aarch64.deps

+9-6
Original file line numberDiff line numberDiff line change
@@ -26,34 +26,37 @@ devdeps-oss-c-sdk-3.11.2-42024100915.al8.aarch64.rpm
2626
devdeps-zlib-static-1.2.13-82024102414.al8.aarch64.rpm
2727
devdeps-ncurses-static-6.2-112024092810.al8.aarch64.rpm
2828
devdeps-boost-1.74.0-72024092811.al8.aarch64.rpm
29-
devdeps-s2geometry-0.9.0-112024100811.al8.aarch64.rpm
29+
devdeps-abseil-cpp-20211102.0-62024122014.al8.aarch64.rpm
30+
devdeps-s2geometry-0.10.0-122024122617.al8.aarch64.rpm
3031
devdeps-icu-69.1-232024120517.al8.aarch64.rpm
3132
devdeps-cos-c-sdk-5.0.21-282024102810.al8.aarch64.rpm
3233
devdeps-s3-cpp-sdk-1.11.156-222024100811.al8.aarch64.rpm
3334
devdeps-protobuf-c-1.4.1-100000132024092815.al8.aarch64.rpm
3435
devdeps-roaringbitmap-croaring-3.0.0-92024092815.al8.aarch64.rpm
3536
devdeps-apache-arrow-9.0.0-562024092815.al8.aarch64.rpm
3637
devdeps-apache-orc-1.8.3-412024092817.al8.aarch64.rpm
37-
devdeps-vsag-1.0.0-312024101010.al8.aarch64.rpm
38+
devdeps-vsag-1.0.0-392024120610.al8.aarch64.rpm
3839
devdeps-fast-float-6.1.3-42024112122.al8.aarch64.rpm
40+
devdeps-hdfs-sdk-3.3.6-72024112119.al8.aarch64.rpm
3941

4042
[tools]
4143
obdevtools-binutils-2.30-82024092619.al8.aarch64.rpm
4244
obdevtools-bison-2.4.1-42024092621.al8.aarch64.rpm
4345
obdevtools-ccache-3.7.12-52024092621.al8.aarch64.rpm
4446
obdevtools-cmake-3.22.1-122024092710.al8.aarch64.rpm
4547
obdevtools-flex-2.5.35-42024092621.al8.aarch64.rpm
46-
obdevtools-gcc9-9.3.0-152024092711.al8.aarch64.rpm
48+
obdevtools-gcc9-9.3.0-152024092711.al8.aarch64.rpm cpp_standard=11
49+
obdevtools-gcc-12.3.0-32024122017.al8.aarch64.rpm cpp_standard=20
4750
obdevtools-llvm-11.0.1-662024092811.al8.aarch64.rpm cpp_standard=11
4851
obdevtools-llvm-17.0.3-232024111415.al8.aarch64.rpm cpp_standard=20
4952

5053
[tools-deps]
5154
devdeps-oblogmsg-1.1-122024093010.al8.aarch64.rpm
5255
obdevtools-obstack-2.0.4-42024101017.al8.aarch64.rpm
53-
devdeps-rocksdb-6.22.1.1-172024092818.al8.aarch64.rpm
54-
obshell-4.2.5.0-12024121011.al8.aarch64.rpm target=community
56+
devdeps-rocksdb-6.22.1-32024123015.al8.aarch64.rpm
57+
obshell-4.2.5.1-12025010214.al8.aarch64.rpm target=community
5558

5659
[test-utils]
57-
ob-deploy-2.10.0-4.al8.aarch64.rpm target=community
60+
ob-deploy-3.0.1-1.al8.aarch64.rpm target=community
5861
obclient-2.2.3-202024102217.al8.aarch64.rpm target=community
5962
libobclient-2.2.3-152024102213.al8.aarch64.rpm target=community

deps/init/oceanbase.al8.x86_64.deps

+11-8
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ devdeps-oss-c-sdk-3.11.2-42024100915.al8.x86_64.rpm
2727
devdeps-zlib-static-1.2.13-82024102414.al8.x86_64.rpm
2828
devdeps-ncurses-static-6.2-112024092810.al8.x86_64.rpm
2929
devdeps-boost-1.74.0-72024092811.al8.x86_64.rpm
30-
devdeps-s2geometry-0.9.0-112024100811.al8.x86_64.rpm
30+
devdeps-abseil-cpp-20211102.0-62024122014.al8.x86_64.rpm
31+
devdeps-s2geometry-0.10.0-122024122617.al8.x86_64.rpm
3132
devdeps-icu-69.1-232024120517.al8.x86_64.rpm
3233
devdeps-cloud-qpl-1.1.0-312024092814.al8.x86_64.rpm
3334
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
3738
devdeps-apache-arrow-9.0.0-562024092815.al8.x86_64.rpm
3839
devdeps-hyperscan-5.4.2-252024092817.al8.x86_64.rpm
3940
devdeps-apache-orc-1.8.3-412024092817.al8.x86_64.rpm
40-
devdeps-vsag-1.0.0-312024101010.al8.x86_64.rpm
41+
devdeps-vsag-1.0.0-392024120610.al8.x86_64.rpm
4142
devdeps-fast-float-6.1.3-42024112122.al8.x86_64.rpm
43+
devdeps-hdfs-sdk-3.3.6-72024112119.al8.x86_64.rpm
4244

4345
[tools]
4446
obdevtools-binutils-2.30-82024092619.al8.x86_64.rpm
4547
obdevtools-bison-2.4.1-42024092621.al8.x86_64.rpm
4648
obdevtools-ccache-3.7.12-52024092621.al8.x86_64.rpm
4749
obdevtools-cmake-3.22.1-122024092710.al8.x86_64.rpm
4850
obdevtools-flex-2.5.35-42024092621.al8.x86_64.rpm
49-
obdevtools-gcc9-9.3.0-152024092711.al8.x86_64.rpm
50-
obdevtools-llvm-11.0.1-312022092921.el8.x86_64.rpm cpp_standard=11
51-
obdevtools-llvm-17.0.3-232024111415.el8.x86_64.rpm cpp_standard=20
51+
obdevtools-gcc9-9.3.0-152024092711.al8.x86_64.rpm cpp_standard=11
52+
obdevtools-gcc-12.3.0-32024122017.al8.x86_64.rpm cpp_standard=20
53+
obdevtools-llvm-11.0.1-662024092811.al8.x86_64.rpm cpp_standard=11
54+
obdevtools-llvm-17.0.3-232024111415.al8.x86_64.rpm cpp_standard=20
5255

5356
[tools-deps]
5457
devdeps-oblogmsg-1.1-122024093010.al8.x86_64.rpm
55-
devdeps-rocksdb-6.22.1.1-172024092818.al8.x86_64.rpm
58+
devdeps-rocksdb-6.22.1-32024123015.al8.x86_64.rpm
5659
obdevtools-obstack-2.0.4-42024101017.al8.x86_64.rpm
57-
obshell-4.2.5.0-12024121011.al8.x86_64.rpm target=community
60+
obshell-4.2.5.1-12025010214.al8.x86_64.rpm target=community
5861

5962
[test-utils]
60-
ob-deploy-2.10.0-4.al8.x86_64.rpm target=community
63+
ob-deploy-3.0.1-1.al8.x86_64.rpm target=community
6164
obclient-2.2.3-202024102217.al8.x86_64.rpm target=community
6265
libobclient-2.2.3-152024102213.al8.x86_64.rpm target=community

deps/init/oceanbase.el7.aarch64.deps

+9-6
Original file line numberDiff line numberDiff line change
@@ -26,34 +26,37 @@ devdeps-oss-c-sdk-3.11.2-42024100915.el7.aarch64.rpm
2626
devdeps-zlib-static-1.2.13-82024102414.el7.aarch64.rpm
2727
devdeps-ncurses-static-6.2-72022100815.el7.aarch64.rpm
2828
devdeps-boost-1.74.0-22022110914.el7.aarch64.rpm
29-
devdeps-s2geometry-0.9.0-12023092021.el7.aarch64.rpm
29+
devdeps-abseil-cpp-20211102.0-62024122014.el7.aarch64.rpm
30+
devdeps-s2geometry-0.10.0-122024122617.el7.aarch64.rpm
3031
devdeps-icu-69.1-72022112416.el7.aarch64.rpm
3132
devdeps-cos-c-sdk-5.0.21-202024080916.el7.aarch64.rpm
3233
devdeps-s3-cpp-sdk-1.11.156-102023122011.el7.aarch64.rpm
3334
devdeps-protobuf-c-1.4.1-100000072023102410.el7.aarch64.rpm
3435
devdeps-roaringbitmap-croaring-3.0.0-42024042816.el7.aarch64.rpm
3536
devdeps-apache-arrow-9.0.0-302024052920.el7.aarch64.rpm
3637
devdeps-apache-orc-1.8.3-392024091317.el7.aarch64.rpm
37-
devdeps-vsag-1.0.0-352024102510.el7.aarch64.rpm
38+
devdeps-vsag-1.0.0-392024120610.el7.aarch64.rpm
3839
devdeps-fast-float-6.1.3-42024112122.el7.aarch64.rpm
40+
devdeps-hdfs-sdk-3.3.6-72024112119.el7.aarch64.rpm
3941

4042
[tools]
4143
obdevtools-binutils-2.30-12022100413.el7.aarch64.rpm
4244
obdevtools-bison-2.4.1-12022100413.el7.aarch64.rpm
4345
obdevtools-ccache-3.7.12-12022100417.el7.aarch64.rpm
4446
obdevtools-cmake-3.30.3-52024111819.el7.aarch64.rpm
4547
obdevtools-flex-2.5.35-12022100417.el7.aarch64.rpm
46-
obdevtools-gcc9-9.3.0-52022092914.el7.aarch64.rpm
48+
obdevtools-gcc9-9.3.0-52022092914.el7.aarch64.rpm cpp_standard=11
49+
obdevtools-gcc-12.3.0-32024122017.el7.aarch64.rpm cpp_standard=20
4750
obdevtools-llvm-11.0.1-312022092921.el7.aarch64.rpm cpp_standard=11
4851
obdevtools-llvm-17.0.3-232024111415.el7.aarch64.rpm cpp_standard=20
4952

5053
[tools-deps]
5154
devdeps-oblogmsg-1.1-52024052811.el7.aarch64.rpm
52-
devdeps-rocksdb-6.22.1.1-52022100420.el7.aarch64.rpm
55+
devdeps-rocksdb-6.22.1-32024123015.el7.aarch64.rpm
5356
obstack-2.0.4-172024070513.el7.aarch64.rpm
54-
obshell-4.2.5.0-12024121011.el7.aarch64.rpm target=community
57+
obshell-4.2.5.1-12025010214.el7.aarch64.rpm target=community
5558

5659
[test-utils]
57-
ob-deploy-2.10.0-3.el7.aarch64.rpm target=community
60+
ob-deploy-3.0.1-1.el7.aarch64.rpm target=community
5861
obclient-2.2.2-1.el7.aarch64.rpm target=community
5962
libobclient-2.2.2-3.el7.aarch64.rpm target=community

deps/init/oceanbase.el7.x86_64.deps

+9-6
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ devdeps-oss-c-sdk-3.11.2-42024100915.el7.x86_64.rpm
2828
devdeps-zlib-static-1.2.13-82024102414.el7.x86_64.rpm
2929
devdeps-ncurses-static-6.2-72022100815.el7.x86_64.rpm
3030
devdeps-boost-1.74.0-22022110914.el7.x86_64.rpm
31-
devdeps-s2geometry-0.9.0-12023092021.el7.x86_64.rpm
31+
devdeps-abseil-cpp-20211102.0-62024122014.el7.x86_64.rpm
32+
devdeps-s2geometry-0.10.0-122024122617.el7.x86_64.rpm
3233
devdeps-icu-69.1-72022112416.el7.x86_64.rpm
3334
devdeps-cloud-qpl-1.1.0-272023061419.el7.x86_64.rpm
3435
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
3839
devdeps-apache-arrow-9.0.0-222024052223.el7.x86_64.rpm
3940
devdeps-hyperscan-5.4.2-242024090219.el7.x86_64.rpm
4041
devdeps-apache-orc-1.8.3-392024091317.el7.x86_64.rpm
41-
devdeps-vsag-1.0.0-352024102510.el7.x86_64.rpm
42+
devdeps-vsag-1.0.0-392024120610.el7.x86_64.rpm
4243
devdeps-fast-float-6.1.3-42024112122.el7.x86_64.rpm
44+
devdeps-hdfs-sdk-3.3.6-72024112119.el7.x86_64.rpm
4345

4446
[tools]
4547
obdevtools-binutils-2.30-12022100413.el7.x86_64.rpm
4648
obdevtools-bison-2.4.1-12022100413.el7.x86_64.rpm
4749
obdevtools-ccache-3.7.12-12022100417.el7.x86_64.rpm
4850
obdevtools-cmake-3.30.3-52024111819.el7.x86_64.rpm
4951
obdevtools-flex-2.5.35-12022100417.el7.x86_64.rpm
50-
obdevtools-gcc9-9.3.0-52022092914.el7.x86_64.rpm
52+
obdevtools-gcc9-9.3.0-52022092914.el7.x86_64.rpm cpp_standard=11
53+
obdevtools-gcc-12.3.0-32024122017.el7.x86_64.rpm cpp_standard=20
5154
obdevtools-llvm-11.0.1-312022092921.el7.x86_64.rpm cpp_standard=11
5255
obdevtools-llvm-17.0.3-232024111415.el7.x86_64.rpm cpp_standard=20
5356

5457
[tools-deps]
5558
devdeps-oblogmsg-1.1-52024052811.el7.x86_64.rpm
56-
devdeps-rocksdb-6.22.1.1-52022100420.el7.x86_64.rpm
59+
devdeps-rocksdb-6.22.1-32024123015.el7.x86_64.rpm
5760
obstack-2.0.4-172024070513.el7.x86_64.rpm
58-
obshell-4.2.5.0-12024121011.el7.x86_64.rpm target=community
61+
obshell-4.2.5.1-12025010214.el7.x86_64.rpm target=community
5962

6063
[test-utils]
61-
ob-deploy-2.10.0-3.el7.x86_64.rpm target=community
64+
ob-deploy-3.0.1-1.el7.x86_64.rpm target=community
6265
obclient-2.2.2-1.el7.x86_64.rpm target=community
6366
libobclient-2.2.2-3.el7.x86_64.rpm target=community

deps/init/oceanbase.el8.aarch64.deps

+9-6
Original file line numberDiff line numberDiff line change
@@ -26,34 +26,37 @@ devdeps-oss-c-sdk-3.11.2-42024100915.el8.aarch64.rpm
2626
devdeps-zlib-static-1.2.13-82024102414.el8.aarch64.rpm
2727
devdeps-ncurses-static-6.2-72022100815.el8.aarch64.rpm
2828
devdeps-boost-1.74.0-22022110914.el8.aarch64.rpm
29-
devdeps-s2geometry-0.9.0-12023092021.el8.aarch64.rpm
29+
devdeps-abseil-cpp-20211102.0-62024122014.el8.aarch64.rpm
30+
devdeps-s2geometry-0.10.0-122024122617.el8.aarch64.rpm
3031
devdeps-icu-69.1-72022112416.el8.aarch64.rpm
3132
devdeps-cos-c-sdk-5.0.21-202024080916.el8.aarch64.rpm
3233
devdeps-s3-cpp-sdk-1.11.156-102023122011.el8.aarch64.rpm
3334
devdeps-protobuf-c-1.4.1-100000072023102410.el8.aarch64.rpm
3435
devdeps-roaringbitmap-croaring-3.0.0-42024042816.el8.aarch64.rpm
3536
devdeps-apache-arrow-9.0.0-322024052923.el8.aarch64.rpm
3637
devdeps-apache-orc-1.8.3-392024091317.el8.aarch64.rpm
37-
devdeps-vsag-1.0.0-352024102510.el8.aarch64.rpm
38+
devdeps-vsag-1.0.0-392024120610.el8.aarch64.rpm
3839
devdeps-fast-float-6.1.3-42024112122.el8.aarch64.rpm
40+
devdeps-hdfs-sdk-3.3.6-72024112119.el8.aarch64.rpm
3941

4042
[tools]
4143
obdevtools-binutils-2.30-12022100413.el8.aarch64.rpm
4244
obdevtools-bison-2.4.1-12022100413.el8.aarch64.rpm
4345
obdevtools-ccache-3.7.12-12022100417.el8.aarch64.rpm
4446
obdevtools-cmake-3.30.3-52024111819.el8.aarch64.rpm
4547
obdevtools-flex-2.5.35-12022100417.el8.aarch64.rpm
46-
obdevtools-gcc9-9.3.0-52022092914.el8.aarch64.rpm
48+
obdevtools-gcc9-9.3.0-52022092914.el8.aarch64.rpm cpp_standard=11
49+
obdevtools-gcc-12.3.0-32024122017.el8.aarch64.rpm cpp_standard=20
4750
obdevtools-llvm-11.0.1-312022092921.el8.aarch64.rpm cpp_standard=11
4851
obdevtools-llvm-17.0.3-232024111415.el8.aarch64.rpm cpp_standard=20
4952

5053
[tools-deps]
5154
devdeps-oblogmsg-1.1-52024052811.el8.aarch64.rpm
52-
devdeps-rocksdb-6.22.1.1-52022100420.el8.aarch64.rpm
55+
devdeps-rocksdb-6.22.1-32024123015.el8.aarch64.rpm
5356
obstack-2.0.4-172024070513.el8.aarch64.rpm
54-
obshell-4.2.5.0-12024121011.el8.aarch64.rpm target=community
57+
obshell-4.2.5.1-12025010214.el8.aarch64.rpm target=community
5558

5659
[test-utils]
57-
ob-deploy-2.10.0-3.el8.aarch64.rpm target=community
60+
ob-deploy-3.0.1-1.el8.aarch64.rpm target=community
5861
obclient-2.2.2-1.el8.aarch64.rpm target=community
5962
libobclient-2.2.2-3.el8.aarch64.rpm target=community

deps/init/oceanbase.el8.x86_64.deps

+9-6
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ devdeps-oss-c-sdk-3.11.2-42024100915.el8.x86_64.rpm
2727
devdeps-zlib-static-1.2.13-82024102414.el8.x86_64.rpm
2828
devdeps-ncurses-static-6.2-72022100815.el8.x86_64.rpm
2929
devdeps-boost-1.74.0-22022110914.el8.x86_64.rpm
30-
devdeps-s2geometry-0.9.0-12023092021.el8.x86_64.rpm
30+
devdeps-abseil-cpp-20211102.0-62024122014.el8.x86_64.rpm
31+
devdeps-s2geometry-0.10.0-122024122617.el8.x86_64.rpm
3132
devdeps-icu-69.1-72022112416.el8.x86_64.rpm
3233
devdeps-cos-c-sdk-5.0.21-202024080916.el8.x86_64.rpm
3334
devdeps-s3-cpp-sdk-1.11.156-102023122011.el8.x86_64.rpm
@@ -36,27 +37,29 @@ devdeps-roaringbitmap-croaring-3.0.0-42024042816.el8.x86_64.rpm
3637
devdeps-apache-arrow-9.0.0-172024052218.el8.x86_64.rpm
3738
devdeps-hyperscan-5.4.2-242024090219.el8.x86_64.rpm
3839
devdeps-apache-orc-1.8.3-392024091317.el8.x86_64.rpm
39-
devdeps-vsag-1.0.0-352024102510.el8.x86_64.rpm
40+
devdeps-vsag-1.0.0-392024120610.el8.x86_64.rpm
4041
devdeps-cloud-qpl-1.1.0-272023061419.el8.x86_64.rpm
4142
devdeps-fast-float-6.1.3-42024112122.el8.x86_64.rpm
43+
devdeps-hdfs-sdk-3.3.6-72024112119.el8.x86_64.rpm
4244

4345
[tools]
4446
obdevtools-binutils-2.30-12022100413.el8.x86_64.rpm
4547
obdevtools-bison-2.4.1-12022100413.el8.x86_64.rpm
4648
obdevtools-ccache-3.7.12-12022100417.el8.x86_64.rpm
4749
obdevtools-cmake-3.30.3-52024111819.el8.x86_64.rpm
4850
obdevtools-flex-2.5.35-12022100417.el8.x86_64.rpm
49-
obdevtools-gcc9-9.3.0-52022092914.el8.x86_64.rpm
51+
obdevtools-gcc9-9.3.0-52022092914.el8.x86_64.rpm cpp_standard=11
52+
obdevtools-gcc-12.3.0-32024122017.el8.x86_64.rpm cpp_standard=20
5053
obdevtools-llvm-11.0.1-312022092921.el8.x86_64.rpm cpp_standard=11
5154
obdevtools-llvm-17.0.3-232024111415.el8.x86_64.rpm cpp_standard=20
5255

5356
[tools-deps]
5457
devdeps-oblogmsg-1.1-52024052811.el8.x86_64.rpm
55-
devdeps-rocksdb-6.22.1.1-52022100420.el8.x86_64.rpm
58+
devdeps-rocksdb-6.22.1-32024123015.el8.x86_64.rpm
5659
obstack-2.0.4-172024070513.el8.x86_64.rpm
57-
obshell-4.2.5.0-12024121011.el8.x86_64.rpm target=community
60+
obshell-4.2.5.1-12025010214.el8.x86_64.rpm target=community
5861

5962
[test-utils]
60-
ob-deploy-2.10.0-3.el8.x86_64.rpm target=community
63+
ob-deploy-3.0.1-1.el8.x86_64.rpm target=community
6164
obclient-2.2.2-1.el8.x86_64.rpm target=community
6265
libobclient-2.2.2-3.el8.x86_64.rpm target=community

deps/init/oceanbase.el9.aarch64.deps

+8-5
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,18 @@ devdeps-oss-c-sdk-3.11.2-42024100915.el8.aarch64.rpm
3030
devdeps-zlib-static-1.2.13-82024102414.el8.aarch64.rpm
3131
devdeps-ncurses-static-6.2-72022100815.el8.aarch64.rpm
3232
devdeps-boost-1.74.0-22022110914.el8.aarch64.rpm
33-
devdeps-s2geometry-0.9.0-12023092021.el8.aarch64.rpm
33+
devdeps-abseil-cpp-20211102.0-62024122014.el8.aarch64.rpm
34+
devdeps-s2geometry-0.10.0-122024122617.el8.aarch64.rpm
3435
devdeps-icu-69.1-72022112416.el8.aarch64.rpm
3536
devdeps-cos-c-sdk-5.0.21-202024080916.el8.aarch64.rpm
3637
devdeps-s3-cpp-sdk-1.11.156-102023122011.el8.aarch64.rpm
3738
devdeps-protobuf-c-1.4.1-100000072023102410.el8.aarch64.rpm
3839
devdeps-roaringbitmap-croaring-3.0.0-42024042816.el8.aarch64.rpm
3940
devdeps-apache-arrow-9.0.0-322024052923.el8.aarch64.rpm
4041
devdeps-apache-orc-1.8.3-392024091317.el8.aarch64.rpm
41-
devdeps-vsag-1.0.0-352024102510.el8.aarch64.rpm
42+
devdeps-vsag-1.0.0-392024120610.el8.aarch64.rpm
4243
devdeps-fast-float-6.1.3-42024112122.el8.aarch64.rpm
44+
devdeps-hdfs-sdk-3.3.6-72024112119.el8.aarch64.rpm
4345

4446
[deps-el9]
4547
devdeps-apr-1.6.5-232023090616.el9.aarch64.rpm target=el9
@@ -50,15 +52,16 @@ obdevtools-bison-2.4.1-12022100413.el8.aarch64.rpm
5052
obdevtools-ccache-3.7.12-12022100417.el8.aarch64.rpm
5153
obdevtools-cmake-3.30.3-52024111819.el8.aarch64.rpm
5254
obdevtools-flex-2.5.35-12022100417.el8.aarch64.rpm
53-
obdevtools-gcc9-9.3.0-52022092914.el8.aarch64.rpm
55+
obdevtools-gcc9-9.3.0-52022092914.el8.aarch64.rpm cpp_standard=11
56+
obdevtools-gcc-12.3.0-32024122017.el8.aarch64.rpm cpp_standard=20
5457
obdevtools-llvm-11.0.1-312022092921.el8.aarch64.rpm cpp_standard=11
5558
obdevtools-llvm-17.0.3-232024111415.el8.aarch64.rpm cpp_standard=20
5659

5760
[tools-deps]
5861
devdeps-oblogmsg-1.1-52024052811.el8.aarch64.rpm
59-
devdeps-rocksdb-6.22.1.1-52022100420.el8.aarch64.rpm
62+
devdeps-rocksdb-6.22.1-32024123015.el8.aarch64.rpm
6063
obstack-2.0.4-172024070513.el8.aarch64.rpm
61-
obshell-4.2.5.0-12024121011.el8.aarch64.rpm target=community
64+
obshell-4.2.5.1-12025010214.el8.aarch64.rpm target=community
6265

6366
[test-utils]
6467
ob-deploy-1.6.0-41.el8.aarch64.rpm target=community

0 commit comments

Comments
 (0)