Skip to content

Commit cd42ec1

Browse files
wangbowangbo
authored
[Fix] Add compile check for SchemaScanner (#45797)
1 parent 583e6cd commit cd42ec1

15 files changed

+70
-42
lines changed

‎be/src/exec/schema_scanner/schema_active_queries_scanner.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
#include "vec/data_types/data_type_factory.hpp"
2727

2828
namespace doris {
29+
#include "common/compile_check_begin.h"
30+
2931
std::vector<SchemaScanner::ColumnDesc> SchemaActiveQueriesScanner::_s_tbls_columns = {
3032
// name, type, size
3133
{"QUERY_ID", TYPE_VARCHAR, sizeof(StringRef), true},
@@ -92,7 +94,7 @@ Status SchemaActiveQueriesScanner::_get_active_queries_block_from_fe() {
9294
_active_query_block->reserve(_block_rows_limit);
9395

9496
if (result_data.size() > 0) {
95-
int col_size = result_data[0].column_value.size();
97+
auto col_size = result_data[0].column_value.size();
9698
if (col_size != _s_tbls_columns.size()) {
9799
return Status::InternalError<false>("active queries schema is not match for FE and BE");
98100
}
@@ -119,7 +121,7 @@ Status SchemaActiveQueriesScanner::get_next_block_internal(vectorized::Block* bl
119121

120122
if (_active_query_block == nullptr) {
121123
RETURN_IF_ERROR(_get_active_queries_block_from_fe());
122-
_total_rows = _active_query_block->rows();
124+
_total_rows = (int)_active_query_block->rows();
123125
}
124126

125127
if (_row_idx == _total_rows) {

‎be/src/exec/schema_scanner/schema_backend_active_tasks.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
#include "vec/data_types/data_type_factory.hpp"
2626

2727
namespace doris {
28+
#include "common/compile_check_begin.h"
29+
2830
std::vector<SchemaScanner::ColumnDesc> SchemaBackendActiveTasksScanner::_s_tbls_columns = {
2931
// name, type, size
3032
{"BE_ID", TYPE_BIGINT, sizeof(int64_t), false},
@@ -76,7 +78,7 @@ Status SchemaBackendActiveTasksScanner::get_next_block_internal(vectorized::Bloc
7678

7779
ExecEnv::GetInstance()->runtime_query_statistics_mgr()->get_active_be_tasks_block(
7880
_task_stats_block.get());
79-
_total_rows = _task_stats_block->rows();
81+
_total_rows = (int)_task_stats_block->rows();
8082
}
8183

8284
if (_row_idx == _total_rows) {

‎be/src/exec/schema_scanner/schema_catalog_meta_cache_stats_scanner.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
#include "vec/data_types/data_type_factory.hpp"
2828

2929
namespace doris {
30+
#include "common/compile_check_begin.h"
31+
3032
std::vector<SchemaScanner::ColumnDesc> SchemaCatalogMetaCacheStatsScanner::_s_tbls_columns = {
3133
{"CATALOG_NAME", TYPE_STRING, sizeof(StringRef), true},
3234
{"CACHE_NAME", TYPE_STRING, sizeof(StringRef), true},
@@ -86,7 +88,7 @@ Status SchemaCatalogMetaCacheStatsScanner::_get_meta_cache_from_fe() {
8688
_block->reserve(_block_rows_limit);
8789

8890
if (result_data.size() > 0) {
89-
int col_size = result_data[0].column_value.size();
91+
auto col_size = result_data[0].column_value.size();
9092
if (col_size != _s_tbls_columns.size()) {
9193
return Status::InternalError<false>(
9294
"catalog meta cache stats schema is not match for FE and BE");
@@ -115,7 +117,7 @@ Status SchemaCatalogMetaCacheStatsScanner::get_next_block_internal(vectorized::B
115117

116118
if (_block == nullptr) {
117119
RETURN_IF_ERROR(_get_meta_cache_from_fe());
118-
_total_rows = _block->rows();
120+
_total_rows = (int)_block->rows();
119121
}
120122

121123
if (_row_idx == _total_rows) {

‎be/src/exec/schema_scanner/schema_columns_scanner.cpp

+7-5
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
#include "vec/common/string_ref.h"
3131

3232
namespace doris {
33+
#include "common/compile_check_begin.h"
34+
3335
class RuntimeState;
3436

3537
namespace vectorized {
@@ -411,7 +413,7 @@ Status SchemaColumnsScanner::_fill_block_impl(vectorized::Block* block) {
411413
{
412414
std::vector<StringRef> strs(columns_num);
413415
int offset_index = 0;
414-
int cur_table_index = _table_index - _desc_result.tables_offset.size();
416+
int cur_table_index = int(_table_index - _desc_result.tables_offset.size());
415417

416418
for (int i = 0; i < columns_num; ++i) {
417419
while (_desc_result.tables_offset[offset_index] <= i) {
@@ -609,14 +611,14 @@ Status SchemaColumnsScanner::_fill_block_impl(vectorized::Block* block) {
609611
// EXTRA
610612
{
611613
StringRef str = StringRef("", 0);
612-
std::vector<void*> datas(columns_num, &str);
613-
RETURN_IF_ERROR(fill_dest_column_for_range(block, 17, datas));
614+
std::vector<void*> filled_values(columns_num, &str);
615+
RETURN_IF_ERROR(fill_dest_column_for_range(block, 17, filled_values));
614616
}
615617
// PRIVILEGES
616618
{
617619
StringRef str = StringRef("", 0);
618-
std::vector<void*> datas(columns_num, &str);
619-
RETURN_IF_ERROR(fill_dest_column_for_range(block, 18, datas));
620+
std::vector<void*> filled_values(columns_num, &str);
621+
RETURN_IF_ERROR(fill_dest_column_for_range(block, 18, filled_values));
620622
}
621623
// COLUMN_COMMENT
622624
{

‎be/src/exec/schema_scanner/schema_file_cache_statistics.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#include "vec/data_types/data_type_factory.hpp"
2626

2727
namespace doris {
28+
#include "common/compile_check_begin.h"
2829

2930
std::vector<SchemaScanner::ColumnDesc> SchemaFileCacheStatisticsScanner::_s_tbls_columns = {
3031
// name, type, size
@@ -68,7 +69,7 @@ Status SchemaFileCacheStatisticsScanner::get_next_block_internal(vectorized::Blo
6869
_stats_block->reserve(_block_rows_limit);
6970

7071
ExecEnv::GetInstance()->file_cache_factory()->get_cache_stats_block(_stats_block.get());
71-
_total_rows = _stats_block->rows();
72+
_total_rows = (int)_stats_block->rows();
7273
}
7374

7475
if (_row_idx == _total_rows) {

‎be/src/exec/schema_scanner/schema_partitions_scanner.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
#include "vec/data_types/data_type_factory.hpp"
3232

3333
namespace doris {
34+
#include "common/compile_check_begin.h"
35+
3436
class RuntimeState;
3537
namespace vectorized {
3638
class Block;
@@ -138,7 +140,7 @@ Status SchemaPartitionsScanner::get_onedb_info_from_fe(int64_t dbId) {
138140
}
139141
_partitions_block->reserve(_block_rows_limit);
140142
if (result_data.size() > 0) {
141-
int col_size = result_data[0].column_value.size();
143+
auto col_size = result_data[0].column_value.size();
142144
if (col_size != _s_tbls_columns.size()) {
143145
return Status::InternalError<false>("table options schema is not match for FE and BE");
144146
}
@@ -178,7 +180,7 @@ Status SchemaPartitionsScanner::get_next_block_internal(vectorized::Block* block
178180
if (_db_index < _db_result.db_ids.size()) {
179181
RETURN_IF_ERROR(get_onedb_info_from_fe(_db_result.db_ids[_db_index]));
180182
_row_idx = 0; // reset row index so that it start filling for next block.
181-
_total_rows = _partitions_block->rows();
183+
_total_rows = (int)_partitions_block->rows();
182184
_db_index++;
183185
}
184186
}

‎be/src/exec/schema_scanner/schema_processlist_scanner.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#include "vec/data_types/data_type_factory.hpp"
3131

3232
namespace doris {
33+
#include "common/compile_check_begin.h"
3334

3435
std::vector<SchemaScanner::ColumnDesc> SchemaProcessListScanner::_s_processlist_columns = {
3536
{"CURRENT_CONNECTED", TYPE_VARCHAR, sizeof(StringRef), false},
@@ -126,7 +127,7 @@ Status SchemaProcessListScanner::_fill_block_impl(vectorized::Block* block) {
126127
datas[row_idx] = &int_vals[row_idx];
127128
} else if (_s_processlist_columns[col_idx].type == TYPE_DATETIMEV2) {
128129
auto* dv = reinterpret_cast<DateV2Value<DateTimeV2ValueType>*>(&int_vals[row_idx]);
129-
if (!dv->from_date_str(column_value.data(), column_value.size(), -1,
130+
if (!dv->from_date_str(column_value.data(), (int)column_value.size(), -1,
130131
config::allow_zero_date)) {
131132
return Status::InternalError(
132133
"process list meet invalid data, column={}, data={}, reason={}",

‎be/src/exec/schema_scanner/schema_routine_scanner.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
#include "vec/data_types/data_type_factory.hpp"
2727

2828
namespace doris {
29+
#include "common/compile_check_begin.h"
30+
2931
std::vector<SchemaScanner::ColumnDesc> SchemaRoutinesScanner::_s_tbls_columns = {
3032
{"SPECIFIC_NAME", TYPE_VARCHAR, sizeof(StringRef), true},
3133
{"ROUTINE_CATALOG", TYPE_VARCHAR, sizeof(StringRef), true},
@@ -94,7 +96,7 @@ Status SchemaRoutinesScanner::get_block_from_fe() {
9496
}
9597
_routines_block->reserve(_block_rows_limit);
9698
if (result_data.size() > 0) {
97-
int col_size = result_data[0].column_value.size();
99+
auto col_size = result_data[0].column_value.size();
98100
if (col_size != _s_tbls_columns.size()) {
99101
return Status::InternalError<false>("routine table schema is not match for FE and BE");
100102
}
@@ -121,7 +123,7 @@ Status SchemaRoutinesScanner::get_next_block_internal(vectorized::Block* block,
121123

122124
if (_routines_block == nullptr) {
123125
RETURN_IF_ERROR(get_block_from_fe());
124-
_total_rows = _routines_block->rows();
126+
_total_rows = (int)_routines_block->rows();
125127
}
126128

127129
if (_row_idx == _total_rows) {

‎be/src/exec/schema_scanner/schema_rowsets_scanner.cpp

+17-15
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ namespace vectorized {
4848
class Block;
4949
} // namespace vectorized
5050

51+
#include "common/compile_check_begin.h"
52+
5153
std::vector<SchemaScanner::ColumnDesc> SchemaRowsetsScanner::_s_tbls_columns = {
5254
// name, type, size, is_null
5355
{"BACKEND_ID", TYPE_BIGINT, sizeof(int64_t), true},
@@ -132,13 +134,13 @@ Status SchemaRowsetsScanner::get_next_block_internal(vectorized::Block* block, b
132134
Status SchemaRowsetsScanner::_fill_block_impl(vectorized::Block* block) {
133135
SCOPED_TIMER(_fill_block_timer);
134136
size_t fill_rowsets_num = std::min(1000UL, rowsets_.size() - _rowsets_idx);
135-
auto fill_idx_begin = _rowsets_idx;
136-
auto fill_idx_end = _rowsets_idx + fill_rowsets_num;
137+
size_t fill_idx_begin = _rowsets_idx;
138+
size_t fill_idx_end = _rowsets_idx + fill_rowsets_num;
137139
std::vector<void*> datas(fill_rowsets_num);
138140
// BACKEND_ID
139141
{
140142
int64_t src = backend_id_;
141-
for (int i = fill_idx_begin; i < fill_idx_end; ++i) {
143+
for (size_t i = fill_idx_begin; i < fill_idx_end; ++i) {
142144
datas[i - fill_idx_begin] = &src;
143145
}
144146
RETURN_IF_ERROR(fill_dest_column_for_range(block, 0, datas));
@@ -147,7 +149,7 @@ Status SchemaRowsetsScanner::_fill_block_impl(vectorized::Block* block) {
147149
{
148150
std::vector<std::string> rowset_ids(fill_rowsets_num);
149151
std::vector<StringRef> strs(fill_rowsets_num);
150-
for (int i = fill_idx_begin; i < fill_idx_end; ++i) {
152+
for (size_t i = fill_idx_begin; i < fill_idx_end; ++i) {
151153
RowsetSharedPtr rowset = rowsets_[i];
152154
rowset_ids[i - fill_idx_begin] = rowset->rowset_id().to_string();
153155
strs[i - fill_idx_begin] = StringRef(rowset_ids[i - fill_idx_begin].c_str(),
@@ -159,7 +161,7 @@ Status SchemaRowsetsScanner::_fill_block_impl(vectorized::Block* block) {
159161
// TABLET_ID
160162
{
161163
std::vector<int64_t> srcs(fill_rowsets_num);
162-
for (int i = fill_idx_begin; i < fill_idx_end; ++i) {
164+
for (size_t i = fill_idx_begin; i < fill_idx_end; ++i) {
163165
RowsetSharedPtr rowset = rowsets_[i];
164166
srcs[i - fill_idx_begin] = rowset->rowset_meta()->tablet_id();
165167
datas[i - fill_idx_begin] = srcs.data() + i - fill_idx_begin;
@@ -169,7 +171,7 @@ Status SchemaRowsetsScanner::_fill_block_impl(vectorized::Block* block) {
169171
// ROWSET_NUM_ROWS
170172
{
171173
std::vector<int64_t> srcs(fill_rowsets_num);
172-
for (int i = fill_idx_begin; i < fill_idx_end; ++i) {
174+
for (size_t i = fill_idx_begin; i < fill_idx_end; ++i) {
173175
RowsetSharedPtr rowset = rowsets_[i];
174176
srcs[i - fill_idx_begin] = rowset->num_rows();
175177
datas[i - fill_idx_begin] = srcs.data() + i - fill_idx_begin;
@@ -179,7 +181,7 @@ Status SchemaRowsetsScanner::_fill_block_impl(vectorized::Block* block) {
179181
// TXN_ID
180182
{
181183
std::vector<int64_t> srcs(fill_rowsets_num);
182-
for (int i = fill_idx_begin; i < fill_idx_end; ++i) {
184+
for (size_t i = fill_idx_begin; i < fill_idx_end; ++i) {
183185
RowsetSharedPtr rowset = rowsets_[i];
184186
srcs[i - fill_idx_begin] = rowset->txn_id();
185187
datas[i - fill_idx_begin] = srcs.data() + i - fill_idx_begin;
@@ -189,7 +191,7 @@ Status SchemaRowsetsScanner::_fill_block_impl(vectorized::Block* block) {
189191
// NUM_SEGMENTS
190192
{
191193
std::vector<int64_t> srcs(fill_rowsets_num);
192-
for (int i = fill_idx_begin; i < fill_idx_end; ++i) {
194+
for (size_t i = fill_idx_begin; i < fill_idx_end; ++i) {
193195
RowsetSharedPtr rowset = rowsets_[i];
194196
srcs[i - fill_idx_begin] = rowset->num_segments();
195197
datas[i - fill_idx_begin] = srcs.data() + i - fill_idx_begin;
@@ -199,7 +201,7 @@ Status SchemaRowsetsScanner::_fill_block_impl(vectorized::Block* block) {
199201
// START_VERSION
200202
{
201203
std::vector<int64_t> srcs(fill_rowsets_num);
202-
for (int i = fill_idx_begin; i < fill_idx_end; ++i) {
204+
for (size_t i = fill_idx_begin; i < fill_idx_end; ++i) {
203205
RowsetSharedPtr rowset = rowsets_[i];
204206
srcs[i - fill_idx_begin] = rowset->start_version();
205207
datas[i - fill_idx_begin] = srcs.data() + i - fill_idx_begin;
@@ -209,7 +211,7 @@ Status SchemaRowsetsScanner::_fill_block_impl(vectorized::Block* block) {
209211
// END_VERSION
210212
{
211213
std::vector<int64_t> srcs(fill_rowsets_num);
212-
for (int i = fill_idx_begin; i < fill_idx_end; ++i) {
214+
for (size_t i = fill_idx_begin; i < fill_idx_end; ++i) {
213215
RowsetSharedPtr rowset = rowsets_[i];
214216
srcs[i - fill_idx_begin] = rowset->end_version();
215217
datas[i - fill_idx_begin] = srcs.data() + i - fill_idx_begin;
@@ -219,7 +221,7 @@ Status SchemaRowsetsScanner::_fill_block_impl(vectorized::Block* block) {
219221
// INDEX_DISK_SIZE
220222
{
221223
std::vector<int64_t> srcs(fill_rowsets_num);
222-
for (int i = fill_idx_begin; i < fill_idx_end; ++i) {
224+
for (size_t i = fill_idx_begin; i < fill_idx_end; ++i) {
223225
RowsetSharedPtr rowset = rowsets_[i];
224226
srcs[i - fill_idx_begin] = rowset->index_disk_size();
225227
datas[i - fill_idx_begin] = srcs.data() + i - fill_idx_begin;
@@ -229,7 +231,7 @@ Status SchemaRowsetsScanner::_fill_block_impl(vectorized::Block* block) {
229231
// DATA_DISK_SIZE
230232
{
231233
std::vector<int64_t> srcs(fill_rowsets_num);
232-
for (int i = fill_idx_begin; i < fill_idx_end; ++i) {
234+
for (size_t i = fill_idx_begin; i < fill_idx_end; ++i) {
233235
RowsetSharedPtr rowset = rowsets_[i];
234236
srcs[i - fill_idx_begin] = rowset->data_disk_size();
235237
datas[i - fill_idx_begin] = srcs.data() + i - fill_idx_begin;
@@ -239,7 +241,7 @@ Status SchemaRowsetsScanner::_fill_block_impl(vectorized::Block* block) {
239241
// CREATION_TIME
240242
{
241243
std::vector<VecDateTimeValue> srcs(fill_rowsets_num);
242-
for (int i = fill_idx_begin; i < fill_idx_end; ++i) {
244+
for (size_t i = fill_idx_begin; i < fill_idx_end; ++i) {
243245
RowsetSharedPtr rowset = rowsets_[i];
244246
int64_t creation_time = rowset->creation_time();
245247
srcs[i - fill_idx_begin].from_unixtime(creation_time, TimezoneUtils::default_time_zone);
@@ -250,7 +252,7 @@ Status SchemaRowsetsScanner::_fill_block_impl(vectorized::Block* block) {
250252
// NEWEST_WRITE_TIMESTAMP
251253
{
252254
std::vector<VecDateTimeValue> srcs(fill_rowsets_num);
253-
for (int i = fill_idx_begin; i < fill_idx_end; ++i) {
255+
for (size_t i = fill_idx_begin; i < fill_idx_end; ++i) {
254256
RowsetSharedPtr rowset = rowsets_[i];
255257
int64_t newest_write_timestamp = rowset->newest_write_timestamp();
256258
srcs[i - fill_idx_begin].from_unixtime(newest_write_timestamp,
@@ -262,7 +264,7 @@ Status SchemaRowsetsScanner::_fill_block_impl(vectorized::Block* block) {
262264
// SCHEMA_VERSION
263265
{
264266
std::vector<int32_t> srcs(fill_rowsets_num);
265-
for (int i = fill_idx_begin; i < fill_idx_end; ++i) {
267+
for (size_t i = fill_idx_begin; i < fill_idx_end; ++i) {
266268
RowsetSharedPtr rowset = rowsets_[i];
267269
srcs[i - fill_idx_begin] = rowset->tablet_schema()->schema_version();
268270
datas[i - fill_idx_begin] = srcs.data() + i - fill_idx_begin;

‎be/src/exec/schema_scanner/schema_table_options_scanner.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
#include "vec/data_types/data_type_factory.hpp"
2828

2929
namespace doris {
30+
#include "common/compile_check_begin.h"
31+
3032
std::vector<SchemaScanner::ColumnDesc> SchemaTableOptionsScanner::_s_tbls_columns = {
3133
{"TABLE_CATALOG", TYPE_VARCHAR, sizeof(StringRef), true},
3234
{"TABLE_SCHEMA", TYPE_VARCHAR, sizeof(StringRef), true},
@@ -110,7 +112,7 @@ Status SchemaTableOptionsScanner::get_onedb_info_from_fe(int64_t dbId) {
110112
}
111113
_tableoptions_block->reserve(_block_rows_limit);
112114
if (result_data.size() > 0) {
113-
int col_size = result_data[0].column_value.size();
115+
auto col_size = result_data[0].column_value.size();
114116
if (col_size != _s_tbls_columns.size()) {
115117
return Status::InternalError<false>("table options schema is not match for FE and BE");
116118
}
@@ -150,7 +152,7 @@ Status SchemaTableOptionsScanner::get_next_block_internal(vectorized::Block* blo
150152
if (_db_index < _db_result.db_ids.size()) {
151153
RETURN_IF_ERROR(get_onedb_info_from_fe(_db_result.db_ids[_db_index]));
152154
_row_idx = 0; // reset row index so that it start filling for next block.
153-
_total_rows = _tableoptions_block->rows();
155+
_total_rows = (int)_tableoptions_block->rows();
154156
_db_index++;
155157
}
156158
}

‎be/src/exec/schema_scanner/schema_table_properties_scanner.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
#include "vec/data_types/data_type_factory.hpp"
2828

2929
namespace doris {
30+
#include "common/compile_check_begin.h"
31+
3032
std::vector<SchemaScanner::ColumnDesc> SchemaTablePropertiesScanner::_s_tbls_columns = {
3133
{"TABLE_CATALOG", TYPE_VARCHAR, sizeof(StringRef), true},
3234
{"TABLE_SCHEMA", TYPE_VARCHAR, sizeof(StringRef), true},
@@ -108,7 +110,7 @@ Status SchemaTablePropertiesScanner::get_onedb_info_from_fe(int64_t dbId) {
108110
}
109111
_tableproperties_block->reserve(_block_rows_limit);
110112
if (result_data.size() > 0) {
111-
int col_size = result_data[0].column_value.size();
113+
auto col_size = result_data[0].column_value.size();
112114
if (col_size != _s_tbls_columns.size()) {
113115
return Status::InternalError<false>("table options schema is not match for FE and BE");
114116
}
@@ -148,7 +150,7 @@ Status SchemaTablePropertiesScanner::get_next_block_internal(vectorized::Block*
148150
if (_db_index < _db_result.db_ids.size()) {
149151
RETURN_IF_ERROR(get_onedb_info_from_fe(_db_result.db_ids[_db_index]));
150152
_row_idx = 0; // reset row index so that it start filling for next block.
151-
_total_rows = _tableproperties_block->rows();
153+
_total_rows = (int)_tableproperties_block->rows();
152154
_db_index++;
153155
}
154156
}

0 commit comments

Comments
 (0)