packages/oceanbase-ce
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
oceanbase-ce/diff.patch
linguanren 59b93af0b4 init push: build oceanbase 4.2.1.4
2024-04-18 10:43:30 +08:00

365 lines
13 KiB
Diff
Raw Blame History

diff --git a/cmake/RPM.cmake b/cmake/RPM.cmake
index f0cec90..9affad8 100644
--- a/cmake/RPM.cmake
+++ b/cmake/RPM.cmake
@@ -230,171 +230,6 @@ install(FILES
DESTINATION include
COMPONENT sql-parser)
-## oceanbsae-table
-install(FILES
- deps/oblib/src/common/data_buffer.h
- deps/oblib/src/common/ob_accuracy.h
- deps/oblib/src/common/ob_action_flag.h
- deps/oblib/src/common/ob_common_utility.h
- deps/oblib/src/common/ob_range.h
- deps/oblib/src/common/ob_region.h
- deps/oblib/src/common/ob_role.h
- deps/oblib/src/common/ob_string_buf.h
- deps/oblib/src/common/ob_string_buf.ipp
- deps/oblib/src/common/ob_timeout_ctx.h
- deps/oblib/src/common/ob_zerofill_info.h
- deps/oblib/src/common/ob_zone.h
- deps/oblib/src/common/object/ob_obj_type.h
- deps/oblib/src/common/object/ob_object.h
- deps/oblib/src/common/rowkey/ob_rowkey.h
- deps/oblib/src/common/rowkey/ob_rowkey_info.h
- deps/oblib/src/lib/alloc/abit_set.h
- deps/oblib/src/lib/alloc/alloc_assist.h
- deps/oblib/src/lib/alloc/alloc_func.h
- deps/oblib/src/lib/alloc/alloc_struct.h
- deps/oblib/src/lib/alloc/block_set.h
- deps/oblib/src/lib/alloc/ob_malloc_allocator.h
- deps/oblib/src/lib/alloc/ob_tenant_ctx_allocator.h
- deps/oblib/src/lib/alloc/object_mgr.h
- deps/oblib/src/lib/alloc/object_set.h
- deps/oblib/src/lib/allocator/ob_allocator.h
- deps/oblib/src/lib/allocator/ob_cached_allocator.h
- deps/oblib/src/lib/allocator/ob_concurrent_fifo_allocator.h
- deps/oblib/src/lib/allocator/ob_fifo_allocator.h
- deps/oblib/src/lib/allocator/ob_lf_fifo_allocator.h
- deps/oblib/src/lib/allocator/ob_malloc.h
- deps/oblib/src/lib/allocator/ob_mod_define.h
- deps/oblib/src/lib/allocator/ob_pcounter.h
- deps/oblib/src/lib/allocator/ob_pooled_allocator.h
- deps/oblib/src/lib/allocator/ob_retire_station.h
- deps/oblib/src/lib/allocator/ob_small_allocator.h
- deps/oblib/src/lib/allocator/ob_tc_malloc.h
- deps/oblib/src/lib/allocator/page_arena.h
- deps/oblib/src/lib/atomic/ob_atomic.h
- deps/oblib/src/lib/atomic/ob_atomic_reference.h
- deps/oblib/src/lib/charset/ob_charset.h
- deps/oblib/src/lib/charset/ob_config.h
- deps/oblib/src/lib/charset/ob_ctype.h
- deps/oblib/src/lib/charset/ob_mysql_global.h
- deps/oblib/src/lib/checksum/ob_crc64.h
- deps/oblib/src/lib/container/ob_array.h
- deps/oblib/src/lib/container/ob_array_helper.h
- deps/oblib/src/lib/container/ob_array_iterator.h
- deps/oblib/src/lib/container/ob_array_serialization.h
- deps/oblib/src/lib/container/ob_array_wrap.h
- deps/oblib/src/lib/container/ob_bit_set.h
- deps/oblib/src/lib/container/ob_fixed_array.h
- deps/oblib/src/lib/container/ob_iarray.h
- deps/oblib/src/lib/container/ob_se_array.h
- deps/oblib/src/lib/container/ob_vector.h
- deps/oblib/src/lib/container/ob_vector.ipp
- deps/oblib/src/lib/core_local/ob_core_local_storage.h
- deps/oblib/src/lib/file/config.h
- deps/oblib/src/lib/file/ob_string_util.h
- deps/oblib/src/lib/hash/mprotect.h
- deps/oblib/src/lib/hash/ob_array_index_hash_set.h
- deps/oblib/src/lib/hash/ob_hashmap.h
- deps/oblib/src/lib/hash/ob_hashset.h
- deps/oblib/src/lib/hash/ob_hashtable.h
- deps/oblib/src/lib/hash/ob_hashutils.h
- deps/oblib/src/lib/hash/ob_iteratable_hashmap.h
- deps/oblib/src/lib/hash/ob_linear_hash_map.h
- deps/oblib/src/lib/hash/ob_placement_hashutils.h
- deps/oblib/src/lib/hash/ob_pointer_hashmap.h
- deps/oblib/src/lib/hash/ob_serialization.h
- deps/oblib/src/lib/hash_func/murmur_hash.h
- deps/oblib/src/lib/hash_func/ob_hash_func.h
- deps/oblib/src/lib/json/ob_yson.h
- deps/oblib/src/lib/json/ob_yson_encode.h
- deps/oblib/src/lib/list/ob_dlink_node.h
- deps/oblib/src/lib/list/ob_dlist.h
- deps/oblib/src/lib/list/ob_list.h
- deps/oblib/src/lib/lock/cond.h
- deps/oblib/src/lib/lock/ob_lock.h
- deps/oblib/src/lib/lock/ob_monitor.h
- deps/oblib/src/lib/lock/mutex.h
- deps/oblib/src/lib/lock/ob_bucket_lock.h
- deps/oblib/src/lib/lock/ob_drw_lock.h
- deps/oblib/src/lib/lock/ob_latch.h
- deps/oblib/src/lib/lock/ob_lock_guard.h
- deps/oblib/src/lib/lock/ob_mutex.h
- deps/oblib/src/lib/lock/ob_small_spin_lock.h
- deps/oblib/src/lib/lock/ob_spin_lock.h
- deps/oblib/src/lib/lock/ob_spin_rwlock.h
- deps/oblib/src/lib/lock/ob_thread_cond.h
- deps/oblib/src/lib/lock/ob_rwlock.h
- deps/oblib/src/lib/metrics/ob_counter.h
- deps/oblib/src/lib/net/ob_addr.h
- deps/oblib/src/lib/net/ob_net_util.h
- deps/oblib/src/lib/number/ob_number_v2.h
- deps/oblib/src/lib/ob_date_unit_type.h
- deps/oblib/src/lib/ob_define.h
- deps/oblib/src/lib/ob_errno.h
- deps/oblib/src/lib/ob_name_def.h
- deps/oblib/src/lib/ob_name_id_def.h
- deps/oblib/src/lib/oblog/ob_log.h
- deps/oblib/src/lib/oblog/ob_log_module.h
- deps/oblib/src/lib/oblog/ob_log_print_kv.h
- deps/oblib/src/lib/oblog/ob_trace_log.h
- deps/oblib/src/lib/profile/ob_atomic_event.h
- deps/oblib/src/lib/queue/ob_dedup_queue.h
- deps/oblib/src/lib/queue/ob_fixed_queue.h
- deps/oblib/src/lib/queue/ob_link.h
- deps/oblib/src/lib/random/ob_random.h
- deps/oblib/src/lib/resource/achunk_mgr.h
- deps/oblib/src/lib/resource/ob_cache_washer.h
- deps/oblib/src/lib/resource/ob_resource_mgr.h
- deps/oblib/src/lib/stat/ob_latch_define.h
- deps/oblib/src/lib/string/ob_fixed_length_string.h
- deps/oblib/src/lib/string/ob_string.h
- deps/oblib/src/lib/string/ob_strings.h
- deps/oblib/src/lib/thread_local/ob_tsi_factory.h
- deps/oblib/src/lib/thread_local/ob_tsi_utils.h
- deps/oblib/src/lib/time/Time.h
- deps/oblib/src/lib/time/ob_time_utility.h
- deps/oblib/src/lib/timezone/ob_time_convert.h
- deps/oblib/src/lib/timezone/ob_timezone_info.h
- deps/oblib/src/lib/trace/ob_seq_event_recorder.h
- deps/oblib/src/lib/trace/ob_trace_event.h
- deps/oblib/src/lib/utility/ob_hang_fatal_error.h
- deps/oblib/src/lib/utility/ob_macro_utils.h
- deps/oblib/src/lib/utility/ob_print_kv.h
- deps/oblib/src/lib/utility/ob_print_utils.h
- deps/oblib/src/lib/utility/ob_rate_limiter.h
- deps/oblib/src/lib/utility/ob_serialization_helper.h
- deps/oblib/src/lib/utility/ob_template_utils.h
- deps/oblib/src/lib/utility/ob_unify_serialize.h
- deps/oblib/src/lib/utility/serialization.h
- deps/oblib/src/lib/utility/utility.h
- deps/oblib/src/lib/wait_event/ob_wait_class.h
- deps/oblib/src/lib/wait_event/ob_wait_event.h
- src/share/config/ob_common_config.h
- src/share/config/ob_config.h
- src/share/config/ob_config_helper.h
- src/share/mysql_errno.h
- src/share/object/ob_obj_cast.h
- src/share/partition_table/ob_partition_location.h
- src/share/table/ob_table.h
- src/share/table/ob_table_rpc_proxy.h
- src/share/table/ob_table_rpc_struct.h
- src/libtable/src/libobtable.h
- src/libtable/src/ob_table.h
- src/libtable/src/ob_hkv_table.h
- src/libtable/src/ob_pstore.h
- src/libtable/src/ob_table_service_client.h
- src/libtable/src/ob_table_service_config.h
- src/libtable/src/ob_table_define.h
- DESTINATION include
- COMPONENT table)
-
-install(FILES
- src/libtable/examples/ob_pstore_example.cpp
- src/libtable/examples/ob_kvtable_example.cpp
- src/libtable/examples/ob_table_example.cpp
- src/libtable/examples/example_makefile.mk
- DESTINATION examples
- COMPONENT table)
-
if (OB_BUILD_LIBOBTABLE)
if (ENABLE_THIN_LTO)
@@ -406,14 +241,6 @@ if (OB_BUILD_LIBOBTABLE)
COMMAND_EXPAND_LISTS)
list(APPEND BITCODE_TO_ELF_LIST libobtable_static_to_elf)
endif()
-
- install(PROGRAMS
- ${CMAKE_BINARY_DIR}/src/libtable/src/libobtable.so
- ${CMAKE_BINARY_DIR}/src/libtable/src/libobtable.so.1
- ${CMAKE_BINARY_DIR}/src/libtable/src/libobtable.so.1.0.0
- ${CMAKE_BINARY_DIR}/src/libtable/src/libobtable_static.a
- DESTINATION lib
- COMPONENT table)
endif()
if(OB_BUILD_OPENSOURCE)
diff --git a/deps/init/dep_create.sh b/deps/init/dep_create.sh
index ad5f149..aaa0b41 100644
--- a/deps/init/dep_create.sh
+++ b/deps/init/dep_create.sh
@@ -80,6 +80,9 @@ function get_os_release() {
fedora)
version_ge "33" && compat_centos7 && return
;;
+ openEuler)
+ version_ge "22" && compat_centos9 && return
+ ;;
opensuse-leap)
version_ge "15" && compat_centos7 && return
;;
@@ -110,6 +113,9 @@ function get_os_release() {
version_ge "8.0" && OS_RELEASE=8 && return
version_ge "7.0" && OS_RELEASE=7 && return
;;
+ openEuler)
+ version_ge "22" && compat_centos9 && return
+ ;;
ubuntu)
version_ge "22.04" && compat_centos9 && return
version_ge "16.04" && compat_centos7 && return
diff --git a/deps/init/oceanbase.el7.aarch64.deps b/deps/init/oceanbase.el7.aarch64.deps
index 56c510d..1397b9c 100644
--- a/deps/init/oceanbase.el7.aarch64.deps
+++ b/deps/init/oceanbase.el7.aarch64.deps
@@ -1,12 +1,12 @@
[target-default]
os=7
arch=aarch64
-repo=http://mirrors.aliyun.com/oceanbase/development-kit/el/7/aarch64/
+repo=https://mirrors.oceanbase.com/oceanbase/development-kit/el/7/aarch64/
[target-community]
os=7
arch=aarch64
-repo=http://mirrors.aliyun.com/oceanbase/community/stable/el/7/aarch64/
+repo=https://mirrors.oceanbase.com/oceanbase/community/stable/el/7/aarch64/
[deps]
diff --git a/deps/init/oceanbase.el7.x86_64.deps b/deps/init/oceanbase.el7.x86_64.deps
index e86e501..5b83a69 100644
--- a/deps/init/oceanbase.el7.x86_64.deps
+++ b/deps/init/oceanbase.el7.x86_64.deps
@@ -1,13 +1,13 @@
[target-default]
os=7
arch=x86_64
-repo=http://mirrors.aliyun.com/oceanbase/development-kit/el/7/x86_64/
+repo=https://mirrors.oceanbase.com/oceanbase/development-kit/el/7/x86_64/
[target-community]
os=7
arch=x86_64
-repo=http://mirrors.aliyun.com/oceanbase/community/stable/el/7/x86_64/
+repo=https://mirrors.oceanbase.com/oceanbase/community/stable/el/7/x86_64/
[deps]
diff --git a/deps/init/oceanbase.el8.aarch64.deps b/deps/init/oceanbase.el8.aarch64.deps
index 2b8612c..919cd33 100644
--- a/deps/init/oceanbase.el8.aarch64.deps
+++ b/deps/init/oceanbase.el8.aarch64.deps
@@ -1,12 +1,12 @@
[target-default]
os=8
arch=aarch64
-repo=http://mirrors.aliyun.com/oceanbase/development-kit/el/8/aarch64/
+repo=https://mirrors.oceanbase.com/oceanbase/development-kit/el/8/aarch64/
[target-community]
os=8
arch=aarch64
-repo=http://mirrors.aliyun.com/oceanbase/community/stable/el/8/aarch64/
+repo=https://mirrors.oceanbase.com/oceanbase/community/stable/el/8/aarch64/
[deps]
diff --git a/deps/init/oceanbase.el8.x86_64.deps b/deps/init/oceanbase.el8.x86_64.deps
index bda5fcc..db3c8a1 100644
--- a/deps/init/oceanbase.el8.x86_64.deps
+++ b/deps/init/oceanbase.el8.x86_64.deps
@@ -1,12 +1,12 @@
[target-default]
os=8
arch=x86_64
-repo=http://mirrors.aliyun.com/oceanbase/development-kit/el/8/x86_64/
+repo=https://mirrors.oceanbase.com/oceanbase/development-kit/el/8/x86_64/
[target-community]
os=8
arch=x86_64
-repo=http://mirrors.aliyun.com/oceanbase/community/stable/el/8/x86_64/
+repo=https://mirrors.oceanbase.com/oceanbase/community/stable/el/8/x86_64/
[deps]
diff --git a/deps/init/oceanbase.el9.aarch64.deps b/deps/init/oceanbase.el9.aarch64.deps
index 136767c..07d4b9a 100644
--- a/deps/init/oceanbase.el9.aarch64.deps
+++ b/deps/init/oceanbase.el9.aarch64.deps
@@ -1,17 +1,17 @@
[target-default]
os=9
arch=aarch64
-repo=http://mirrors.aliyun.com/oceanbase/development-kit/el/8/aarch64/
+repo=https://mirrors.oceanbase.com/oceanbase/development-kit/el/8/aarch64/
[target-community]
os=9
arch=aarch64
-repo=http://mirrors.aliyun.com/oceanbase/community/stable/el/8/aarch64/
+repo=https://mirrors.oceanbase.com/oceanbase/community/stable/el/8/aarch64/
[target-apr-el9]
os=9
arch=aarch64
-repo=http://mirrors.aliyun.com/oceanbase/development-kit/el/9/aarch64/
+repo=https://mirrors.oceanbase.com/oceanbase/development-kit/el/9/aarch64/
[deps]
devdeps-gtest-1.8.0-132022101316.el8.aarch64.rpm
@@ -46,8 +46,9 @@ obdevtools-gcc9-9.3.0-52022092914.el8.aarch64.rpm
obdevtools-llvm-11.0.1-312022092921.el8.aarch64.rpm
[tools-deps]
-devdeps-oblogmsg-1.0-52022113019.el8.aarch64.rpm
+devdeps-oblogmsg-1.0-142024012415.el8.aarch64.rpm
devdeps-rocksdb-6.22.1.1-52022100420.el8.aarch64.rpm
+obshell-4.2.2.0-122024022614.el8.aarch64.rpm target=community
[test-utils]
ob-deploy-1.6.0-41.el8.aarch64.rpm target=community
diff --git a/deps/init/oceanbase.el9.x86_64.deps b/deps/init/oceanbase.el9.x86_64.deps
index e9712b3..a359e80 100644
--- a/deps/init/oceanbase.el9.x86_64.deps
+++ b/deps/init/oceanbase.el9.x86_64.deps
@@ -1,17 +1,17 @@
[target-default]
os=9
arch=x86_64
-repo=http://mirrors.aliyun.com/oceanbase/development-kit/el/8/x86_64/
+repo=https://mirrors.oceanbase.com/oceanbase/development-kit/el/8/x86_64/
[target-community]
os=9
arch=x86_64
-repo=http://mirrors.aliyun.com/oceanbase/community/stable/el/8/x86_64/
+repo=https://mirrors.oceanbase.com/oceanbase/community/stable/el/8/x86_64/
[target-apr-el9]
os=9
arch=x86_64
-repo=http://mirrors.aliyun.com/oceanbase/development-kit/el/9/x86_64/
+repo=https://mirrors.oceanbase.com/oceanbase/development-kit/el/9/x86_64/
[deps]
devdeps-gtest-1.8.0-132022101316.el8.x86_64.rpm
@@ -47,8 +47,9 @@ obdevtools-gcc9-9.3.0-52022092914.el8.x86_64.rpm
obdevtools-llvm-11.0.1-312022092921.el8.x86_64.rpm
[tools-deps]
-devdeps-oblogmsg-1.0-52022113019.el8.x86_64.rpm
+devdeps-oblogmsg-1.0-142024012415.el8.x86_64.rpm
devdeps-rocksdb-6.22.1.1-52022100420.el8.x86_64.rpm
+obshell-4.2.2.0-122024022614.el8.x86_64.rpm target=community
[test-utils]
ob-deploy-1.6.0-41.el8.x86_64.rpm target=community
Reference in New Issue View Git Blame Copy Permalink