Skip to content

Commit c227b31

Browse files
obdevfootka
authored and
ob-robot
committed
fix macOs build
Co-authored-by: footka <672528926@qq.com>
1 parent c9cb3c4 commit c227b31

19 files changed

Lines changed: 209 additions & 144 deletions

‎deps/init/oceanbase.el9.aarch64.deps‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,14 @@ devdeps-abseil-cpp-20211102.0-82026020911.el8.aarch64.rpm
3333
devdeps-s2geometry-0.10.0-222026021017.el8.aarch64.rpm
3434
devdeps-icu-69.1-362026020911.el8.aarch64.rpm
3535
devdeps-s3-cpp-sdk-1.11.156-262026021209.el8.aarch64.rpm
36-
devdeps-protobuf-c-1.5.1-100000052025032810.el8.aarch64.rpm
36+
devdeps-protobuf-c-abiv1-1.4.1-100000202026031815.el8.aarch64.rpm
37+
devdeps-grpc-abiv1-1.46.7-572026031815.el8.aarch64.rpm
3738
devdeps-roaringbitmap-croaring-3.0.0-42024042816.el8.aarch64.rpm
3839
devdeps-apache-arrow-20.0.0-452026020914.el8.aarch64.rpm
3940
devdeps-vsag-abiv1-1.1.0-1682026031620.el8.aarch64.rpm
4041
devdeps-apache-orc-2.1.1-122026020912.el8.aarch64.rpm
4142
devdeps-fast-float-6.1.3-42024112122.el8.aarch64.rpm
43+
devdeps-sqlite-abiv1-3.38.1-72026031815.el8.aarch64.rpm
4244

4345
[deps-el9]
4446
devdeps-apr-1.6.5-232023090616.el9.aarch64.rpm target=el9

‎deps/init/oceanbase.el9.x86_64.deps‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,15 @@ devdeps-abseil-cpp-20211102.0-82026020911.el8.x86_64.rpm
3434
devdeps-s2geometry-0.10.0-222026021017.el8.x86_64.rpm
3535
devdeps-icu-69.1-362026020911.el8.x86_64.rpm
3636
devdeps-s3-cpp-sdk-1.11.156-262026021209.el8.x86_64.rpm
37-
devdeps-protobuf-c-1.5.1-100000052025032810.el8.x86_64.rpm
37+
devdeps-protobuf-c-abiv1-1.4.1-100000202026031815.el8.x86_64.rpm
38+
devdeps-grpc-abiv1-1.46.7-572026031815.el8.x86_64.rpm
3839
devdeps-apache-arrow-20.0.0-452026020914.el8.x86_64.rpm
3940
devdeps-roaringbitmap-croaring-3.0.0-42024042816.el8.x86_64.rpm
4041
devdeps-hyperscan-5.4.2-242024090219.el8.x86_64.rpm
4142
devdeps-vsag-abiv1-1.1.0-1682026031620.el8.x86_64.rpm
4243
devdeps-apache-orc-2.1.1-122026020912.el8.x86_64.rpm
4344
devdeps-fast-float-6.1.3-42024112122.el8.x86_64.rpm
45+
devdeps-sqlite-abiv1-3.38.1-72026031815.el8.x86_64.rpm
4446

4547
[deps-el9]
4648
devdeps-apr-1.6.5-232023090616.el9.x86_64.rpm target=el9

‎deps/init/oceanbase.macos13.arm64.deps‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ devdeps-s3-cpp-sdk-1.11.156-20260126.tar.gz
2929
devdeps-vsag-1.1.0-20260126.tar.gz
3030
devdeps-xz-5.2.2-20260126.tar.gz
3131
devdeps-zlib-1.2.13-20260126.tar.gz
32+
devdeps-grpc-1.46.7-20260319.tar.gz
33+
devdeps-sqlite-3.38.1-20260319.tar.gz
3234

3335
[tools]
3436
obdevtools-bison-2.4.1-20260122.tar.gz

‎deps/init/oceanbase.macos15.arm64.deps‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ devdeps-s3-cpp-sdk-1.11.156-20251210.tar.gz
2929
devdeps-xz-5.2.2-20251208.tar.gz
3030
devdeps-zlib-1.2.13-20251208.tar.gz
3131
devdeps-vsag-1.1.0-20260107.tar.gz
32+
devdeps-grpc-1.46.7-20260318.tar.gz
33+
devdeps-sqlite-3.38.1-20260318.tar.gz
3234

3335
[tools]
3436
obdevtools-llvm-17.0.6-20251212.tar.gz

‎deps/oblib/src/grpc/CMakeLists.txt‎

Lines changed: 94 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,19 @@
11
set(DEVEL_PATH "${DEP_3RD_DIR}/usr/local/oceanbase/deps/devel")
22

3+
# On Linux: grpc libs are in lib/grpc/, abseil/protobuf libs are in lib64/grpc/
4+
# On macOS: all libs are in lib/grpc/
5+
if(APPLE)
6+
set(GRPC_LIB_DIR "lib")
7+
set(ABSL_LIB_DIR "lib")
8+
else()
9+
set(GRPC_LIB_DIR "lib")
10+
set(ABSL_LIB_DIR "lib64")
11+
endif()
12+
313
option(protobuf_MODULE_COMPATIBLE TRUE)
4-
set(_REFLECTION "${DEVEL_PATH}/lib/grpc/libgrpc++_reflection.a")
5-
set(_GRPC_GRPCPP "${DEVEL_PATH}/lib/grpc/libgrpc++.a")
6-
set(_PROTOBUF_LIBPROTOBUF "${DEVEL_PATH}/lib64/grpc/libprotobuf.a")
14+
set(_REFLECTION "${DEVEL_PATH}/${GRPC_LIB_DIR}/grpc/libgrpc++_reflection.a")
15+
set(_GRPC_GRPCPP "${DEVEL_PATH}/${GRPC_LIB_DIR}/grpc/libgrpc++.a")
16+
set(_PROTOBUF_LIBPROTOBUF "${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libprotobuf.a")
717

818
include_directories(
919
${CMAKE_CURRENT_BINARY_DIR}
@@ -25,83 +35,88 @@ add_library(oblib_grpc STATIC
2535
)
2636
target_link_libraries(oblib_grpc
2737
PUBLIC oblib_base
28-
${DEVEL_PATH}/lib/grpc/libgrpc_unsecure.a
29-
${DEVEL_PATH}/lib/grpc/libaddress_sorting.a
30-
${DEVEL_PATH}/lib64/grpc/libcares.a
31-
${DEVEL_PATH}/lib/grpc/libgrpc++_error_details.a
32-
${DEVEL_PATH}/lib/grpc/libgrpc_plugin_support.a
33-
${DEVEL_PATH}/lib/grpc/libgpr.a
34-
${DEVEL_PATH}/lib/grpc/libgrpcpp_channelz.a
35-
${DEVEL_PATH}/lib/grpc/libgrpc.a
36-
${DEVEL_PATH}/lib/grpc/libgrpc++_reflection.a
37-
${DEVEL_PATH}/lib/grpc/libupb.a
38-
${DEVEL_PATH}/lib64/grpc/libabsl_flags_commandlineflag_internal.a
39-
${DEVEL_PATH}/lib64/grpc/libabsl_status.a
40-
${DEVEL_PATH}/lib64/grpc/libabsl_examine_stack.a
41-
${DEVEL_PATH}/lib64/grpc/libabsl_random_internal_randen_hwaes_impl.a
42-
${DEVEL_PATH}/lib64/grpc/libabsl_hash.a
43-
${DEVEL_PATH}/lib64/grpc/libabsl_time_zone.a
44-
${DEVEL_PATH}/lib64/grpc/libabsl_cordz_info.a
45-
${DEVEL_PATH}/lib64/grpc/libabsl_strings.a
46-
${DEVEL_PATH}/lib64/grpc/libabsl_strings_internal.a
47-
${DEVEL_PATH}/lib64/grpc/libabsl_random_internal_pool_urbg.a
48-
${DEVEL_PATH}/lib64/grpc/libabsl_synchronization.a
49-
${DEVEL_PATH}/lib64/grpc/libabsl_failure_signal_handler.a
50-
${DEVEL_PATH}/lib64/grpc/libabsl_strerror.a
51-
${DEVEL_PATH}/lib64/grpc/libabsl_log_severity.a
52-
${DEVEL_PATH}/lib64/grpc/libabsl_debugging_internal.a
53-
${DEVEL_PATH}/lib64/grpc/libabsl_hashtablez_sampler.a
54-
${DEVEL_PATH}/lib64/grpc/libabsl_stacktrace.a
55-
${DEVEL_PATH}/lib64/grpc/libabsl_time.a
56-
${DEVEL_PATH}/lib64/grpc/libabsl_int128.a
57-
${DEVEL_PATH}/lib64/grpc/libabsl_symbolize.a
58-
${DEVEL_PATH}/lib64/grpc/libabsl_cordz_handle.a
59-
${DEVEL_PATH}/lib64/grpc/libabsl_random_internal_seed_material.a
60-
${DEVEL_PATH}/lib64/grpc/libabsl_random_internal_randen_hwaes.a
61-
${DEVEL_PATH}/lib64/grpc/libabsl_bad_any_cast_impl.a
62-
${DEVEL_PATH}/lib64/grpc/libabsl_cord.a
63-
${DEVEL_PATH}/lib64/grpc/libabsl_flags_program_name.a
64-
${DEVEL_PATH}/lib64/grpc/libabsl_random_internal_randen.a
65-
${DEVEL_PATH}/lib64/grpc/libabsl_flags_commandlineflag.a
66-
${DEVEL_PATH}/lib64/grpc/libabsl_raw_hash_set.a
67-
${DEVEL_PATH}/lib64/grpc/libabsl_bad_variant_access.a
68-
${DEVEL_PATH}/lib64/grpc/libabsl_leak_check_disable.a
69-
${DEVEL_PATH}/lib64/grpc/libabsl_graphcycles_internal.a
70-
${DEVEL_PATH}/lib64/grpc/libabsl_statusor.a
71-
${DEVEL_PATH}/lib64/grpc/libabsl_flags.a
72-
${DEVEL_PATH}/lib64/grpc/libabsl_bad_optional_access.a
73-
${DEVEL_PATH}/lib64/grpc/libabsl_str_format_internal.a
74-
${DEVEL_PATH}/lib64/grpc/libabsl_raw_logging_internal.a
75-
${DEVEL_PATH}/lib64/grpc/libabsl_civil_time.a
76-
${DEVEL_PATH}/lib64/grpc/libabsl_flags_private_handle_accessor.a
77-
${DEVEL_PATH}/lib64/grpc/libabsl_random_seed_sequences.a
78-
${DEVEL_PATH}/lib64/grpc/libabsl_exponential_biased.a
79-
${DEVEL_PATH}/lib64/grpc/libabsl_flags_usage.a
80-
${DEVEL_PATH}/lib64/grpc/libabsl_spinlock_wait.a
81-
${DEVEL_PATH}/lib64/grpc/libabsl_cordz_functions.a
82-
${DEVEL_PATH}/lib64/grpc/libabsl_base.a
83-
${DEVEL_PATH}/lib64/grpc/libabsl_cordz_sample_token.a
84-
${DEVEL_PATH}/lib64/grpc/libabsl_random_internal_randen_slow.a
85-
${DEVEL_PATH}/lib64/grpc/libabsl_periodic_sampler.a
86-
${DEVEL_PATH}/lib64/grpc/libabsl_scoped_set_env.a
87-
${DEVEL_PATH}/lib64/grpc/libabsl_random_seed_gen_exception.a
88-
${DEVEL_PATH}/lib64/grpc/libabsl_cord_internal.a
89-
${DEVEL_PATH}/lib64/grpc/libabsl_malloc_internal.a
90-
${DEVEL_PATH}/lib64/grpc/libabsl_low_level_hash.a
91-
${DEVEL_PATH}/lib64/grpc/libabsl_flags_usage_internal.a
92-
${DEVEL_PATH}/lib64/grpc/libabsl_city.a
93-
${DEVEL_PATH}/lib64/grpc/libabsl_random_distributions.a
94-
${DEVEL_PATH}/lib64/grpc/libabsl_demangle_internal.a
95-
${DEVEL_PATH}/lib64/grpc/libabsl_flags_internal.a
96-
${DEVEL_PATH}/lib64/grpc/libabsl_flags_parse.a
97-
${DEVEL_PATH}/lib64/grpc/libabsl_flags_reflection.a
98-
${DEVEL_PATH}/lib64/grpc/libabsl_flags_marshalling.a
99-
${DEVEL_PATH}/lib64/grpc/libabsl_throw_delegate.a
100-
${DEVEL_PATH}/lib64/grpc/libabsl_random_internal_distribution_test_util.a
101-
${DEVEL_PATH}/lib64/grpc/libabsl_flags_config.a
102-
${DEVEL_PATH}/lib64/grpc/libabsl_random_internal_platform.a
103-
${DEVEL_PATH}/lib64/grpc/libabsl_leak_check.a
38+
${DEVEL_PATH}/${GRPC_LIB_DIR}/grpc/libgrpc_unsecure.a
39+
${DEVEL_PATH}/${GRPC_LIB_DIR}/grpc/libaddress_sorting.a
40+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libcares.a
41+
${DEVEL_PATH}/${GRPC_LIB_DIR}/grpc/libgrpc++_error_details.a
42+
${DEVEL_PATH}/${GRPC_LIB_DIR}/grpc/libgrpc_plugin_support.a
43+
${DEVEL_PATH}/${GRPC_LIB_DIR}/grpc/libgpr.a
44+
${DEVEL_PATH}/${GRPC_LIB_DIR}/grpc/libgrpcpp_channelz.a
45+
${DEVEL_PATH}/${GRPC_LIB_DIR}/grpc/libgrpc.a
46+
${DEVEL_PATH}/${GRPC_LIB_DIR}/grpc/libgrpc++_reflection.a
47+
${DEVEL_PATH}/${GRPC_LIB_DIR}/grpc/libupb.a
48+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_flags_commandlineflag_internal.a
49+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_status.a
50+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_examine_stack.a
51+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_random_internal_randen_hwaes_impl.a
52+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_hash.a
53+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_time_zone.a
54+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_cordz_info.a
55+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_strings.a
56+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_strings_internal.a
57+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_random_internal_pool_urbg.a
58+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_synchronization.a
59+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_failure_signal_handler.a
60+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_strerror.a
61+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_log_severity.a
62+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_debugging_internal.a
63+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_hashtablez_sampler.a
64+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_stacktrace.a
65+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_time.a
66+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_int128.a
67+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_symbolize.a
68+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_cordz_handle.a
69+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_random_internal_seed_material.a
70+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_random_internal_randen_hwaes.a
71+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_bad_any_cast_impl.a
72+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_cord.a
73+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_flags_program_name.a
74+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_random_internal_randen.a
75+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_flags_commandlineflag.a
76+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_raw_hash_set.a
77+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_bad_variant_access.a
78+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_leak_check_disable.a
79+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_graphcycles_internal.a
80+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_statusor.a
81+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_flags.a
82+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_bad_optional_access.a
83+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_str_format_internal.a
84+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_raw_logging_internal.a
85+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_civil_time.a
86+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_flags_private_handle_accessor.a
87+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_random_seed_sequences.a
88+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_exponential_biased.a
89+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_flags_usage.a
90+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_spinlock_wait.a
91+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_cordz_functions.a
92+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_base.a
93+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_cordz_sample_token.a
94+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_random_internal_randen_slow.a
95+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_periodic_sampler.a
96+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_scoped_set_env.a
97+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_random_seed_gen_exception.a
98+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_cord_internal.a
99+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_malloc_internal.a
100+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_low_level_hash.a
101+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_flags_usage_internal.a
102+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_city.a
103+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_random_distributions.a
104+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_demangle_internal.a
105+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_flags_internal.a
106+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_flags_parse.a
107+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_flags_reflection.a
108+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_flags_marshalling.a
109+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_throw_delegate.a
110+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_random_internal_distribution_test_util.a
111+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_flags_config.a
112+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_random_internal_platform.a
113+
${DEVEL_PATH}/${ABSL_LIB_DIR}/grpc/libabsl_leak_check.a
104114
${_REFLECTION}
105115
${_GRPC_GRPCPP}
106116
${_PROTOBUF_LIBPROTOBUF}
107117
)
118+
119+
# macOS requires libresolv for c-ares DNS resolution
120+
if(APPLE)
121+
target_link_libraries(oblib_grpc PUBLIC resolv)
122+
endif()

‎deps/oblib/src/lib/utility/ob_print_utils.cpp‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,26 @@ int64_t to_string<uint64_t>(const uint64_t &v, char *buffer, const int64_t buffe
315315
} else {}
316316
return pos;
317317
}
318+
#ifdef __APPLE__
319+
template <>
320+
int64_t to_string<long>(const long &v, char *buffer, const int64_t buffer_size)
321+
{
322+
int ret = OB_SUCCESS;
323+
int64_t pos = 0;
324+
if (OB_FAIL(databuff_printf(buffer, buffer_size, pos, "%ld", v))) {
325+
} else {}
326+
return pos;
327+
}
328+
template <>
329+
int64_t to_string<unsigned long>(const unsigned long &v, char *buffer, const int64_t buffer_size)
330+
{
331+
int ret = OB_SUCCESS;
332+
int64_t pos = 0;
333+
if (OB_FAIL(databuff_printf(buffer, buffer_size, pos, "%lu", v))) {
334+
} else {}
335+
return pos;
336+
}
337+
#endif
318338

319339
template <>
320340
int64_t to_string<float>(const float &v, char *buffer, const int64_t buffer_size)

‎deps/oblib/src/lib/utility/ob_print_utils.h‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,14 @@ template <>
160160
int64_t to_string<int64_t>(const int64_t &obj, char *buffer, const int64_t buffer_size);
161161
template <>
162162
int64_t to_string<uint64_t>(const uint64_t &obj, char *buffer, const int64_t buffer_size);
163+
// On macOS, long and unsigned long are distinct from int64_t and uint64_t
164+
// On Linux x86_64, they are the same types, so we need to guard these
165+
#ifdef __APPLE__
166+
template <>
167+
int64_t to_string<long>(const long &obj, char *buffer, const int64_t buffer_size);
168+
template <>
169+
int64_t to_string<unsigned long>(const unsigned long &obj, char *buffer, const int64_t buffer_size);
170+
#endif
163171
template <>
164172
int64_t to_string<double>(const double &obj, char *buffer, const int64_t buffer_size);
165173
template <>

‎src/logservice/archiveservice/ob_archive_fetcher.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1037,8 +1037,8 @@ void ObArchiveFetcher::statistic(const int64_t log_size, const int64_t ts)
10371037
READ_COST_TS += ts;
10381038
READ_TASK_COUNT += 1;
10391039
if (TC_REACH_TIME_INTERVAL(10 * 1000 * 1000L)) {
1040-
int64_t avg_task_lsn_size = READ_LOG_SIZE / std::max(READ_TASK_COUNT, 1L);
1041-
int64_t avg_task_cost_ts = READ_COST_TS / std::max(READ_TASK_COUNT, 1L);
1040+
int64_t avg_task_lsn_size = READ_LOG_SIZE / std::max(READ_TASK_COUNT, static_cast<int64_t>(1));
1041+
int64_t avg_task_cost_ts = READ_COST_TS / std::max(READ_TASK_COUNT, static_cast<int64_t>(1));
10421042
ARCHIVE_LOG(INFO, "archive_fetcher statistic in 10s", "total_read_log_size", READ_LOG_SIZE,
10431043
"total_read_cost_ts", READ_COST_TS, "total_read_task_count", READ_TASK_COUNT,
10441044
K(avg_task_lsn_size), K(avg_task_cost_ts));

‎src/logservice/archiveservice/ob_archive_persist_mgr.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -777,7 +777,7 @@ int ObArchivePersistValue::set(const bool is_madatory, const ObLSArchivePersistI
777777
const int64_t cur_time = ObTimeUtility::current_time();
778778
if (OB_INVALID_TIMESTAMP == last_update_ts_) {
779779
} else {
780-
speed_ = static_cast<int64_t>(info.lsn_ - info_.lsn_) / std::max(1L, cur_time - last_update_ts_);
780+
speed_ = static_cast<int64_t>(info.lsn_ - info_.lsn_) / std::max(static_cast<int64_t>(1), cur_time - last_update_ts_);
781781
}
782782
is_madatory_ = is_madatory;
783783
info_ = info;

‎src/logservice/archiveservice/ob_archive_scheduler.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,11 @@ int ObArchiveScheduler::modify_thread_count_()
9898
if (0 == log_archive_concurrency) {
9999
const int64_t max_cpu = MTL_CPU_COUNT();
100100
if (max_cpu <= 8) {
101-
archive_concurrency = std::min(max_cpu * 2, 8L);
101+
archive_concurrency = std::min(max_cpu * 2, static_cast<int64_t>(8));
102102
} else if (max_cpu <= 32) {
103-
archive_concurrency = std::max(max_cpu / 2, 8L);
103+
archive_concurrency = std::max(max_cpu / 2, static_cast<int64_t>(8));
104104
} else {
105-
archive_concurrency = std::max(max_cpu / 4, 16L);
105+
archive_concurrency = std::max(max_cpu / 4, static_cast<int64_t>(16));
106106
}
107107
} else {
108108
archive_concurrency = log_archive_concurrency;

0 commit comments

Comments
 (0)