This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 7a023a090c1 [Chore](compile) add compile_check and fix it for some
files. (#55580)
7a023a090c1 is described below
commit 7a023a090c18bbb01d1f8dace57b404b598c8dc1
Author: Qi Chen <[email protected]>
AuthorDate: Wed Sep 3 13:12:46 2025 +0800
[Chore](compile) add compile_check and fix it for some files. (#55580)
---
.../executor/time_sharing/time_sharing_task_executor.cpp | 5 +++--
.../executor/time_sharing/time_sharing_task_handle.cpp | 7 ++++---
be/src/vec/exec/scan/file_scanner.cpp | 13 +++++++------
be/src/vec/exec/scan/file_scanner.h | 2 +-
be/src/vec/exec/scan/split_source_connector.h | 16 +++++++++-------
5 files changed, 24 insertions(+), 19 deletions(-)
diff --git
a/be/src/vec/exec/executor/time_sharing/time_sharing_task_executor.cpp
b/be/src/vec/exec/executor/time_sharing/time_sharing_task_executor.cpp
index b417039ec7d..5d104290177 100644
--- a/be/src/vec/exec/executor/time_sharing/time_sharing_task_executor.cpp
+++ b/be/src/vec/exec/executor/time_sharing/time_sharing_task_executor.cpp
@@ -35,6 +35,7 @@
namespace doris {
namespace vectorized {
+#include "common/compile_check_begin.h"
// Same with definations in threadpool.cpp
// Why use same name:
@@ -890,9 +891,9 @@ void TimeSharingTaskExecutor::_schedule_task_if_necessary(
}
void TimeSharingTaskExecutor::_add_new_entrants(std::unique_lock<std::mutex>&
lock) {
- int running = _all_splits.size() - _intermediate_splits.size();
+ size_t running = _all_splits.size() - _intermediate_splits.size();
int max_loops = !_enable_concurrency_control ?
std::numeric_limits<int>::max()
- : (_min_concurrency -
running);
+ : (_min_concurrency -
static_cast<int>(running));
for (int i = 0; i < max_loops; ++i) {
auto split = _poll_next_split_worker(lock);
if (!split) {
diff --git a/be/src/vec/exec/executor/time_sharing/time_sharing_task_handle.cpp
b/be/src/vec/exec/executor/time_sharing/time_sharing_task_handle.cpp
index 1cae18febe0..8c4b80ce5a6 100644
--- a/be/src/vec/exec/executor/time_sharing/time_sharing_task_handle.cpp
+++ b/be/src/vec/exec/executor/time_sharing/time_sharing_task_handle.cpp
@@ -19,6 +19,7 @@
namespace doris {
namespace vectorized {
+#include "common/compile_check_begin.h"
TimeSharingTaskHandle::TimeSharingTaskHandle(
const TaskId& task_id, std::shared_ptr<SplitQueue> split_queue,
@@ -38,7 +39,7 @@ Status TimeSharingTaskHandle::init() {
Priority TimeSharingTaskHandle::add_scheduled_nanos(int64_t duration_nanos) {
std::lock_guard<std::mutex> lock(_mutex);
_concurrency_controller.update(duration_nanos, _utilization_supplier(),
- _running_leaf_splits.size());
+
static_cast<int>(_running_leaf_splits.size()));
_scheduled_nanos += duration_nanos;
Priority new_priority =
@@ -131,7 +132,7 @@ bool TimeSharingTaskHandle::record_intermediate_split(
int TimeSharingTaskHandle::running_leaf_splits() const {
std::lock_guard<std::mutex> lock(_mutex);
- return _running_leaf_splits.size();
+ return static_cast<int>(_running_leaf_splits.size());
}
int64_t TimeSharingTaskHandle::scheduled_nanos() const {
@@ -163,7 +164,7 @@ std::shared_ptr<PrioritizedSplitRunner>
TimeSharingTaskHandle::poll_next_split()
void
TimeSharingTaskHandle::split_finished(std::shared_ptr<PrioritizedSplitRunner>
split) {
std::lock_guard<std::mutex> lock(_mutex);
_concurrency_controller.split_finished(split->scheduled_nanos(),
_utilization_supplier(),
- _running_leaf_splits.size());
+
static_cast<int>(_running_leaf_splits.size()));
_running_intermediate_splits.erase(split->split_runner());
_running_leaf_splits.erase(split->split_runner());
diff --git a/be/src/vec/exec/scan/file_scanner.cpp
b/be/src/vec/exec/scan/file_scanner.cpp
index feaeed9ac63..f634e883da4 100644
--- a/be/src/vec/exec/scan/file_scanner.cpp
+++ b/be/src/vec/exec/scan/file_scanner.cpp
@@ -94,6 +94,7 @@ class ShardedKVCache;
} // namespace doris
namespace doris::vectorized {
+#include "common/compile_check_begin.h"
using namespace ErrorCode;
const std::string FileScanner::FileReadBytesProfile = "FileReadBytes";
@@ -546,7 +547,7 @@ Status FileScanner::_init_src_block(Block* block) {
// }
_src_block.clear();
- size_t idx = 0;
+ uint32_t idx = 0;
// slots in _input_tuple_desc contains all slots describe in load
statement, eg:
// -H "columns: k1, k2, tmp1, k3 = tmp1 + 1"
// _input_tuple_desc will contains: k1, k2, tmp1
@@ -754,8 +755,8 @@ Status FileScanner::_convert_to_output_block(Block* block) {
}
// for (auto slot_desc : _output_tuple_desc->slots()) {
- for (int i = 0; i < mutable_output_columns.size(); ++i) {
- auto slot_desc = _output_tuple_desc->slots()[i];
+ for (int j = 0; j < mutable_output_columns.size(); ++j) {
+ auto slot_desc = _output_tuple_desc->slots()[j];
if (!slot_desc->is_materialized()) {
continue;
}
@@ -820,7 +821,7 @@ Status FileScanner::_convert_to_output_block(Block* block) {
} else if (slot_desc->is_nullable()) {
column_ptr = make_nullable(column_ptr);
}
- mutable_output_columns[i]->insert_range_from(*column_ptr, 0, rows);
+ mutable_output_columns[j]->insert_range_from(*column_ptr, 0, rows);
ctx_idx++;
}
@@ -882,7 +883,7 @@ Status
FileScanner::_truncate_char_or_varchar_columns(Block* block) {
// VARCHAR substring(VARCHAR str, INT pos[, INT len])
void FileScanner::_truncate_char_or_varchar_column(Block* block, int idx, int
len) {
auto int_type = std::make_shared<DataTypeInt32>();
- size_t num_columns_without_result = block->columns();
+ uint32_t num_columns_without_result = block->columns();
const ColumnNullable* col_nullable =
assert_cast<const
ColumnNullable*>(block->get_by_position(idx).column.get());
const ColumnPtr& string_column_ptr = col_nullable->get_nested_column_ptr();
@@ -897,7 +898,7 @@ void FileScanner::_truncate_char_or_varchar_column(Block*
block, int idx, int le
temp_arguments[0] = idx; // str column
temp_arguments[1] = num_columns_without_result; // pos
temp_arguments[2] = num_columns_without_result + 1; // len
- size_t result_column_id = num_columns_without_result + 2;
+ uint32_t result_column_id = num_columns_without_result + 2;
SubstringUtil::substring_execute(*block, temp_arguments, result_column_id,
block->rows());
auto res =
ColumnNullable::create(block->get_by_position(result_column_id).column,
diff --git a/be/src/vec/exec/scan/file_scanner.h
b/be/src/vec/exec/scan/file_scanner.h
index 46139279a8d..445343fa8e2 100644
--- a/be/src/vec/exec/scan/file_scanner.h
+++ b/be/src/vec/exec/scan/file_scanner.h
@@ -149,7 +149,7 @@ protected:
// dest slot desc index to src slot desc index
std::unordered_map<int, int> _dest_slot_to_src_slot_index;
- std::unordered_map<std::string, size_t> _src_block_name_to_idx;
+ std::unordered_map<std::string, uint32_t> _src_block_name_to_idx;
// Get from GenericReader, save the existing columns in file to their type.
std::unordered_map<std::string, DataTypePtr> _slot_lower_name_to_col_type;
diff --git a/be/src/vec/exec/scan/split_source_connector.h
b/be/src/vec/exec/scan/split_source_connector.h
index fc33cd28ea3..3463ddbb56c 100644
--- a/be/src/vec/exec/scan/split_source_connector.h
+++ b/be/src/vec/exec/scan/split_source_connector.h
@@ -22,6 +22,7 @@
#include "runtime/runtime_state.h"
namespace doris::vectorized {
+#include "common/compile_check_begin.h"
/*
* Multiple scanners within a scan node share a split source.
@@ -57,8 +58,8 @@ protected:
// In the insert statement, reading data in partition order can reduce
the memory usage of BE
// and prevent the generation of smaller tables.
merged_ranges.resize(_max_scanners);
- int num_ranges = scan_ranges.size() / _max_scanners;
- int num_add_one = scan_ranges.size() - num_ranges * _max_scanners;
+ int num_ranges = static_cast<int>(scan_ranges.size()) / _max_scanners;
+ int num_add_one = static_cast<int>(scan_ranges.size()) - num_ranges *
_max_scanners;
int scan_index = 0;
int range_index = 0;
for (int i = 0; i < num_add_one; ++i) {
@@ -66,9 +67,9 @@ protected:
auto& ranges =
merged_ranges[scan_index++].scan_range.ext_scan_range.file_scan_range.ranges;
for (int j = 0; j < num_ranges; j++) {
- auto& merged_ranges =
+ auto& tmp_merged_ranges =
scan_ranges[range_index++].scan_range.ext_scan_range.file_scan_range.ranges;
- ranges.insert(ranges.end(), merged_ranges.begin(),
merged_ranges.end());
+ ranges.insert(ranges.end(), tmp_merged_ranges.begin(),
tmp_merged_ranges.end());
}
}
for (int i = num_add_one; i < _max_scanners; ++i) {
@@ -76,9 +77,9 @@ protected:
auto& ranges =
merged_ranges[scan_index++].scan_range.ext_scan_range.file_scan_range.ranges;
for (int j = 0; j < num_ranges - 1; j++) {
- auto& merged_ranges =
+ auto& tmp_merged_ranges =
scan_ranges[range_index++].scan_range.ext_scan_range.file_scan_range.ranges;
- ranges.insert(ranges.end(), merged_ranges.begin(),
merged_ranges.end());
+ ranges.insert(ranges.end(), tmp_merged_ranges.begin(),
tmp_merged_ranges.end());
}
}
LOG(INFO) << "Merge " << scan_ranges.size() << " scan ranges to " <<
merged_ranges.size();
@@ -109,7 +110,7 @@ public:
Status get_next(bool* has_next, TFileRangeDesc* range) override;
- int num_scan_ranges() override { return _scan_ranges.size(); }
+ int num_scan_ranges() override { return
static_cast<int>(_scan_ranges.size()); }
TFileScanRangeParams* get_params() override {
if (_scan_ranges.size() > 0 &&
@@ -166,4 +167,5 @@ public:
}
};
+#include "common/compile_check_end.h"
} // namespace doris::vectorized
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
