From 7dd8c21a948e8f6a15f08dce8f116aa43fd849b7 Mon Sep 17 00:00:00 2001 From: 924060929 Date: Fri, 15 Nov 2024 23:18:52 +0800 Subject: [PATCH 1/4] fix --- .../aggregate_functions/aggregate_function_approx_top_k.h | 4 ++-- be/src/vec/aggregate_functions/aggregate_function_collect.h | 2 +- .../vec/aggregate_functions/aggregate_function_distinct.h | 2 +- be/src/vec/common/space_saving.h | 6 +++--- be/src/vec/exprs/table_function/vexplode_numbers.cpp | 2 +- be/src/vec/exprs/vruntimefilter_wrapper.h | 3 ++- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/be/src/vec/aggregate_functions/aggregate_function_approx_top_k.h b/be/src/vec/aggregate_functions/aggregate_function_approx_top_k.h index 7253ae8a96e200..c82a74af294019 100644 --- a/be/src/vec/aggregate_functions/aggregate_function_approx_top_k.h +++ b/be/src/vec/aggregate_functions/aggregate_function_approx_top_k.h @@ -88,7 +88,7 @@ class AggregateFunctionApproxTopK final void deserialize(AggregateDataPtr __restrict place, BufferReadable& buf, Arena* arena) const override { auto readStringBinaryInto = [](Arena& arena, BufferReadable& buf) { - size_t size = 0; + uint64_t size = 0; read_var_uint(size, buf); if (UNLIKELY(size > DEFAULT_MAX_STRING_SIZE)) { @@ -104,7 +104,7 @@ class AggregateFunctionApproxTopK final auto& set = this->data(place).value; set.clear(); - size_t size = 0; + uint64_t size = 0; read_var_uint(size, buf); if (UNLIKELY(size > TOP_K_MAX_SIZE)) { throw Exception(ErrorCode::INTERNAL_ERROR, diff --git a/be/src/vec/aggregate_functions/aggregate_function_collect.h b/be/src/vec/aggregate_functions/aggregate_function_collect.h index 02490be56a0bf1..da310c6e0cc4c2 100644 --- a/be/src/vec/aggregate_functions/aggregate_function_collect.h +++ b/be/src/vec/aggregate_functions/aggregate_function_collect.h @@ -98,7 +98,7 @@ struct AggregateFunctionCollectSetData { } void read(BufferReadable& buf) { - size_t new_size = 0; + uint64_t new_size = 0; read_var_uint(new_size, buf); ElementNativeType x; for (size_t i = 0; i < new_size; ++i) { diff --git a/be/src/vec/aggregate_functions/aggregate_function_distinct.h b/be/src/vec/aggregate_functions/aggregate_function_distinct.h index 3cce558312be24..64f60319aac545 100644 --- a/be/src/vec/aggregate_functions/aggregate_function_distinct.h +++ b/be/src/vec/aggregate_functions/aggregate_function_distinct.h @@ -94,7 +94,7 @@ struct AggregateFunctionDistinctSingleNumericData { void deserialize(BufferReadable& buf, Arena*) { DCHECK(!stable); if constexpr (!stable) { - size_t new_size = 0; + uint64_t new_size = 0; read_var_uint(new_size, buf); T x; for (size_t i = 0; i < new_size; ++i) { diff --git a/be/src/vec/common/space_saving.h b/be/src/vec/common/space_saving.h index 18fa216228ddfb..4a05ab2b409c10 100644 --- a/be/src/vec/common/space_saving.h +++ b/be/src/vec/common/space_saving.h @@ -244,10 +244,10 @@ class SpaceSaving { void read(BufferReadable& rb) { destroy_elements(); - size_t count = 0; + uint64_t count = 0; read_var_uint(count, rb); - for (size_t i = 0; i < count; ++i) { + for (UInt64 i = 0; i < count; ++i) { std::unique_ptr counter = std::make_unique(); counter->read(rb); counter->hash = counter_map.hash(counter->key); @@ -259,7 +259,7 @@ class SpaceSaving { // Reads the alpha map data from the provided readable buffer. void read_alpha_map(BufferReadable& rb) { - size_t alpha_size = 0; + uint64_t alpha_size = 0; read_var_uint(alpha_size, rb); for (size_t i = 0; i < alpha_size; ++i) { uint64_t alpha = 0; diff --git a/be/src/vec/exprs/table_function/vexplode_numbers.cpp b/be/src/vec/exprs/table_function/vexplode_numbers.cpp index 0c4c330f73c787..0586b5442b02da 100644 --- a/be/src/vec/exprs/table_function/vexplode_numbers.cpp +++ b/be/src/vec/exprs/table_function/vexplode_numbers.cpp @@ -70,7 +70,7 @@ Status VExplodeNumbersTableFunction::process_init(Block* block, RuntimeState* st ((ColumnInt32*)_elements_column.get())->clear(); //_cur_size may be a negative number - _cur_size = std::max(0L, _cur_size); + _cur_size = std::max(static_cast(0L), _cur_size); if (_cur_size && _cur_size <= state->batch_size()) { // avoid elements_column too big or empty _is_const = true; // use const optimize diff --git a/be/src/vec/exprs/vruntimefilter_wrapper.h b/be/src/vec/exprs/vruntimefilter_wrapper.h index 79e9361e854719..a4bd6c18994457 100644 --- a/be/src/vec/exprs/vruntimefilter_wrapper.h +++ b/be/src/vec/exprs/vruntimefilter_wrapper.h @@ -77,7 +77,8 @@ class VRuntimeFilterWrapper final : public VExpr { template static void judge_selectivity(double ignore_threshold, int64_t filter_rows, int64_t input_rows, T& always_true) { - always_true = filter_rows / (input_rows * 1.0L) < ignore_threshold; + always_true = static_cast(filter_rows) / static_cast(input_rows) + < ignore_threshold; } bool is_rf_wrapper() const override { return true; } From 2a46c06f920fc0bfc198a16c2c16647751759466 Mon Sep 17 00:00:00 2001 From: 924060929 Date: Fri, 15 Nov 2024 23:24:29 +0800 Subject: [PATCH 2/4] fix --- be/src/vec/exprs/vruntimefilter_wrapper.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/be/src/vec/exprs/vruntimefilter_wrapper.h b/be/src/vec/exprs/vruntimefilter_wrapper.h index a4bd6c18994457..060f33e01a1863 100644 --- a/be/src/vec/exprs/vruntimefilter_wrapper.h +++ b/be/src/vec/exprs/vruntimefilter_wrapper.h @@ -77,8 +77,8 @@ class VRuntimeFilterWrapper final : public VExpr { template static void judge_selectivity(double ignore_threshold, int64_t filter_rows, int64_t input_rows, T& always_true) { - always_true = static_cast(filter_rows) / static_cast(input_rows) - < ignore_threshold; + always_true = static_cast(filter_rows) / static_cast(input_rows) < + ignore_threshold; } bool is_rf_wrapper() const override { return true; } From dd5965866a3f7651c7f8c32f85553e303af59d8c Mon Sep 17 00:00:00 2001 From: 924060929 Date: Sat, 16 Nov 2024 10:53:16 +0800 Subject: [PATCH 3/4] fix --- be/src/vec/core/wide_integer.h | 1 + 1 file changed, 1 insertion(+) diff --git a/be/src/vec/core/wide_integer.h b/be/src/vec/core/wide_integer.h index ec316dc2a80967..cfa02ca85183fd 100644 --- a/be/src/vec/core/wide_integer.h +++ b/be/src/vec/core/wide_integer.h @@ -45,6 +45,7 @@ #include #include #include +#include #include #include From 92902b019cf75a4fd37b9ca36ea2b497271d07c5 Mon Sep 17 00:00:00 2001 From: 924060929 Date: Sat, 16 Nov 2024 16:03:30 +0800 Subject: [PATCH 4/4] fix --- be/src/vec/core/wide_integer.h | 1 - 1 file changed, 1 deletion(-) diff --git a/be/src/vec/core/wide_integer.h b/be/src/vec/core/wide_integer.h index cfa02ca85183fd..ec316dc2a80967 100644 --- a/be/src/vec/core/wide_integer.h +++ b/be/src/vec/core/wide_integer.h @@ -45,7 +45,6 @@ #include #include #include -#include #include #include