This is an automated email from the ASF dual-hosted git repository.
panxiaolei 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 659cd821037 [env](compile) open compile check in sink file (#42574)
659cd821037 is described below
commit 659cd821037579fb6ebade9a4df429ab49308429
Author: Mryange <[email protected]>
AuthorDate: Fri Nov 1 10:37:30 2024 +0800
[env](compile) open compile check in sink file (#42574)
open compile check in sink file
---
be/src/util/mysql_row_buffer.cpp | 4 ++--
be/src/util/mysql_row_buffer.h | 2 +-
be/src/vec/sink/autoinc_buffer.cpp | 1 +
be/src/vec/sink/autoinc_buffer.h | 9 ++++++---
be/src/vec/sink/delta_writer_v2_pool.cpp | 1 +
be/src/vec/sink/delta_writer_v2_pool.h | 3 +++
be/src/vec/sink/load_stream_map_pool.cpp | 1 +
be/src/vec/sink/load_stream_map_pool.h | 3 +++
be/src/vec/sink/load_stream_stub.cpp | 10 ++++++----
be/src/vec/sink/load_stream_stub.h | 10 ++++++++--
be/src/vec/sink/varrow_flight_result_writer.cpp | 1 +
be/src/vec/sink/varrow_flight_result_writer.h | 3 +++
be/src/vec/sink/vdata_stream_sender.cpp | 1 +
be/src/vec/sink/vdata_stream_sender.h | 3 +++
be/src/vec/sink/vmysql_result_writer.cpp | 6 ++++--
be/src/vec/sink/vmysql_result_writer.h | 3 +++
be/src/vec/sink/vrow_distribution.cpp | 11 ++++++-----
be/src/vec/sink/vrow_distribution.h | 3 +++
be/src/vec/sink/vtablet_block_convertor.cpp | 9 +++++----
be/src/vec/sink/vtablet_block_convertor.h | 10 ++++++----
be/src/vec/sink/vtablet_finder.cpp | 1 +
be/src/vec/sink/vtablet_finder.h | 4 +++-
be/test/io/fs/stream_sink_file_writer_test.cpp | 2 +-
23 files changed, 72 insertions(+), 29 deletions(-)
diff --git a/be/src/util/mysql_row_buffer.cpp b/be/src/util/mysql_row_buffer.cpp
index 4823920508a..3e20a2d9de7 100644
--- a/be/src/util/mysql_row_buffer.cpp
+++ b/be/src/util/mysql_row_buffer.cpp
@@ -87,9 +87,9 @@ MysqlRowBuffer<is_binary_format>::MysqlRowBuffer()
_len_pos(0) {}
template <bool is_binary_format>
-void MysqlRowBuffer<is_binary_format>::start_binary_row(uint32_t num_cols) {
+void MysqlRowBuffer<is_binary_format>::start_binary_row(uint64_t num_cols) {
assert(is_binary_format);
- int bit_fields = (num_cols + 9) / 8;
+ auto bit_fields = (num_cols + 9) / 8;
reserve(bit_fields + 1);
memset(_pos, 0, 1 + bit_fields);
_pos += bit_fields + 1;
diff --git a/be/src/util/mysql_row_buffer.h b/be/src/util/mysql_row_buffer.h
index b740efa7764..50b17c91c17 100644
--- a/be/src/util/mysql_row_buffer.h
+++ b/be/src/util/mysql_row_buffer.h
@@ -62,7 +62,7 @@ public:
// Prepare for binary row buffer
// init bitmap
- void start_binary_row(uint32_t num_cols);
+ void start_binary_row(uint64_t num_cols);
// TODO(zhaochun): add signed/unsigned support
int push_tinyint(int8_t data);
diff --git a/be/src/vec/sink/autoinc_buffer.cpp
b/be/src/vec/sink/autoinc_buffer.cpp
index 4bc87dff489..4c45b7bc631 100644
--- a/be/src/vec/sink/autoinc_buffer.cpp
+++ b/be/src/vec/sink/autoinc_buffer.cpp
@@ -30,6 +30,7 @@
#include "util/thrift_rpc_helper.h"
namespace doris::vectorized {
+#include "common/compile_check_begin.h"
AutoIncIDBuffer::AutoIncIDBuffer(int64_t db_id, int64_t table_id, int64_t
column_id)
: _db_id(db_id),
diff --git a/be/src/vec/sink/autoinc_buffer.h b/be/src/vec/sink/autoinc_buffer.h
index 032ac18981f..82be3d9faad 100644
--- a/be/src/vec/sink/autoinc_buffer.h
+++ b/be/src/vec/sink/autoinc_buffer.h
@@ -18,12 +18,14 @@
#pragma once
#include <list>
+#include "common/cast_set.h"
#include "common/config.h"
#include "common/factory_creator.h"
#include "common/status.h"
#include "util/threadpool.h"
namespace doris::vectorized {
+#include "common/compile_check_begin.h"
class VOlapTableSink;
class OlapTableBlockConvertor;
@@ -118,8 +120,8 @@ public:
GlobalAutoIncBuffers() {
static_cast<void>(ThreadPoolBuilder("AsyncFetchAutoIncIDExecutor")
-
.set_min_threads(config::auto_inc_fetch_thread_num)
-
.set_max_threads(config::auto_inc_fetch_thread_num)
+
.set_min_threads(cast_set<int>(config::auto_inc_fetch_thread_num))
+
.set_max_threads(cast_set<int>(config::auto_inc_fetch_thread_num))
.set_max_queue_size(std::numeric_limits<int>::max())
.build(&_fetch_autoinc_id_executor));
}
@@ -146,4 +148,5 @@ private:
std::mutex _mutex;
};
-} // namespace doris::vectorized
\ No newline at end of file
+} // namespace doris::vectorized
+#include "common/compile_check_end.h"
diff --git a/be/src/vec/sink/delta_writer_v2_pool.cpp
b/be/src/vec/sink/delta_writer_v2_pool.cpp
index bc5233ac307..c9ae424d4d4 100644
--- a/be/src/vec/sink/delta_writer_v2_pool.cpp
+++ b/be/src/vec/sink/delta_writer_v2_pool.cpp
@@ -21,6 +21,7 @@
#include "util/runtime_profile.h"
namespace doris {
+#include "common/compile_check_begin.h"
class TExpr;
namespace vectorized {
diff --git a/be/src/vec/sink/delta_writer_v2_pool.h
b/be/src/vec/sink/delta_writer_v2_pool.h
index 7e58eea3149..677d062f6b3 100644
--- a/be/src/vec/sink/delta_writer_v2_pool.h
+++ b/be/src/vec/sink/delta_writer_v2_pool.h
@@ -51,6 +51,7 @@
#include "util/uid_util.h"
namespace doris {
+#include "common/compile_check_begin.h"
class DeltaWriterV2;
class RuntimeProfile;
@@ -108,3 +109,5 @@ private:
} // namespace vectorized
} // namespace doris
+
+#include "common/compile_check_end.h"
diff --git a/be/src/vec/sink/load_stream_map_pool.cpp
b/be/src/vec/sink/load_stream_map_pool.cpp
index dc78d306e70..24a1cb77a48 100644
--- a/be/src/vec/sink/load_stream_map_pool.cpp
+++ b/be/src/vec/sink/load_stream_map_pool.cpp
@@ -20,6 +20,7 @@
#include "util/debug_points.h"
namespace doris {
+#include "common/compile_check_begin.h"
class TExpr;
LoadStreamMap::LoadStreamMap(UniqueId load_id, int64_t src_id, int
num_streams, int num_use,
diff --git a/be/src/vec/sink/load_stream_map_pool.h
b/be/src/vec/sink/load_stream_map_pool.h
index 4ecae2f16be..f1ed7b0da16 100644
--- a/be/src/vec/sink/load_stream_map_pool.h
+++ b/be/src/vec/sink/load_stream_map_pool.h
@@ -65,6 +65,7 @@
#include "vec/sink/load_stream_stub.h"
namespace doris {
+#include "common/compile_check_begin.h"
class LoadStreamStub;
@@ -136,3 +137,5 @@ private:
};
} // namespace doris
+
+#include "common/compile_check_end.h"
diff --git a/be/src/vec/sink/load_stream_stub.cpp
b/be/src/vec/sink/load_stream_stub.cpp
index 2a38b179b95..979daf6a85e 100644
--- a/be/src/vec/sink/load_stream_stub.cpp
+++ b/be/src/vec/sink/load_stream_stub.cpp
@@ -19,6 +19,7 @@
#include <sstream>
+#include "common/cast_set.h"
#include "olap/rowset/rowset_writer.h"
#include "runtime/query_context.h"
#include "util/brpc_client_cache.h"
@@ -28,6 +29,7 @@
#include "util/uid_util.h"
namespace doris {
+#include "common/compile_check_begin.h"
int LoadStreamReplyHandler::on_received_messages(brpc::StreamId id,
butil::IOBuf* const messages[],
size_t size) {
@@ -92,7 +94,7 @@ int
LoadStreamReplyHandler::on_received_messages(brpc::StreamId id, butil::IOBuf
TRuntimeProfileTree tprofile;
const uint8_t* buf =
reinterpret_cast<const
uint8_t*>(response.load_stream_profile().data());
- uint32_t len = response.load_stream_profile().size();
+ uint32_t len =
cast_set<uint32_t>(response.load_stream_profile().size());
auto status = deserialize_thrift_msg(buf, &len, false, &tprofile);
if (status.ok()) {
// TODO
@@ -154,7 +156,7 @@ Status
LoadStreamStub::open(BrpcClientCache<PBackendService_Stub>* client_cache,
_is_init.store(true);
_dst_id = node_info.id;
brpc::StreamOptions opt;
- opt.max_buf_size = config::load_stream_max_buf_size;
+ opt.max_buf_size = cast_set<int>(config::load_stream_max_buf_size);
opt.idle_timeout_ms = idle_timeout_ms;
opt.messages_in_batch = config::load_stream_messages_in_batch;
opt.handler = new LoadStreamReplyHandler(_load_id, _dst_id,
shared_from_this());
@@ -213,7 +215,7 @@ Status
LoadStreamStub::open(BrpcClientCache<PBackendService_Stub>* client_cache,
// APPEND_DATA
Status LoadStreamStub::append_data(int64_t partition_id, int64_t index_id,
int64_t tablet_id,
- int64_t segment_id, uint64_t offset,
std::span<const Slice> data,
+ int32_t segment_id, uint64_t offset,
std::span<const Slice> data,
bool segment_eos, FileType file_type) {
if (!_is_open.load()) {
add_failed_tablet(tablet_id, _status);
@@ -240,7 +242,7 @@ Status LoadStreamStub::append_data(int64_t partition_id,
int64_t index_id, int64
// ADD_SEGMENT
Status LoadStreamStub::add_segment(int64_t partition_id, int64_t index_id,
int64_t tablet_id,
- int64_t segment_id, const
SegmentStatistics& segment_stat,
+ int32_t segment_id, const
SegmentStatistics& segment_stat,
TabletSchemaSPtr flush_schema) {
if (!_is_open.load()) {
add_failed_tablet(tablet_id, _status);
diff --git a/be/src/vec/sink/load_stream_stub.h
b/be/src/vec/sink/load_stream_stub.h
index 9816770c82e..cad7a90492a 100644
--- a/be/src/vec/sink/load_stream_stub.h
+++ b/be/src/vec/sink/load_stream_stub.h
@@ -69,6 +69,7 @@
#include "vec/exprs/vexpr_fwd.h"
namespace doris {
+#include "common/compile_check_begin.h"
class TabletSchema;
class LoadStreamStub;
@@ -133,15 +134,18 @@ public:
#ifdef BE_TEST
virtual
#endif
+ // segment_id is limited by max_segment_num_per_rowset (default
value of 1000),
+ // so in practice it will not exceed the range of i16.
+
// APPEND_DATA
Status
append_data(int64_t partition_id, int64_t index_id, int64_t
tablet_id,
- int64_t segment_id, uint64_t offset, std::span<const
Slice> data,
+ int32_t segment_id, uint64_t offset, std::span<const
Slice> data,
bool segment_eos = false, FileType file_type =
FileType::SEGMENT_FILE);
// ADD_SEGMENT
Status add_segment(int64_t partition_id, int64_t index_id, int64_t
tablet_id,
- int64_t segment_id, const SegmentStatistics&
segment_stat,
+ int32_t segment_id, const SegmentStatistics&
segment_stat,
TabletSchemaSPtr flush_schema);
// CLOSE_LOAD
@@ -335,3 +339,5 @@ private:
};
} // namespace doris
+
+#include "common/compile_check_end.h"
diff --git a/be/src/vec/sink/varrow_flight_result_writer.cpp
b/be/src/vec/sink/varrow_flight_result_writer.cpp
index b23d1668465..77788c52ef3 100644
--- a/be/src/vec/sink/varrow_flight_result_writer.cpp
+++ b/be/src/vec/sink/varrow_flight_result_writer.cpp
@@ -25,6 +25,7 @@
#include "vec/exprs/vexpr_context.h"
namespace doris {
+#include "common/compile_check_begin.h"
namespace vectorized {
VArrowFlightResultWriter::VArrowFlightResultWriter(
diff --git a/be/src/vec/sink/varrow_flight_result_writer.h
b/be/src/vec/sink/varrow_flight_result_writer.h
index ab2578421c8..fcae0350b82 100644
--- a/be/src/vec/sink/varrow_flight_result_writer.h
+++ b/be/src/vec/sink/varrow_flight_result_writer.h
@@ -30,6 +30,7 @@
#include "vec/exprs/vexpr_fwd.h"
namespace doris {
+#include "common/compile_check_begin.h"
class BufferControlBlock;
class RuntimeState;
@@ -77,3 +78,5 @@ private:
};
} // namespace vectorized
} // namespace doris
+
+#include "common/compile_check_end.h"
diff --git a/be/src/vec/sink/vdata_stream_sender.cpp
b/be/src/vec/sink/vdata_stream_sender.cpp
index d21b87561b5..2cace094e4d 100644
--- a/be/src/vec/sink/vdata_stream_sender.cpp
+++ b/be/src/vec/sink/vdata_stream_sender.cpp
@@ -53,6 +53,7 @@
#include "vec/sink/writer/vtablet_writer_v2.h"
namespace doris::vectorized {
+#include "common/compile_check_begin.h"
Status Channel::init(RuntimeState* state) {
if (_brpc_dest_addr.hostname.empty()) {
diff --git a/be/src/vec/sink/vdata_stream_sender.h
b/be/src/vec/sink/vdata_stream_sender.h
index 024d87ab32f..5fe35e4da11 100644
--- a/be/src/vec/sink/vdata_stream_sender.h
+++ b/be/src/vec/sink/vdata_stream_sender.h
@@ -53,6 +53,7 @@
#include "vec/sink/vtablet_finder.h"
namespace doris {
+#include "common/compile_check_begin.h"
class ObjectPool;
class RuntimeState;
class MemTracker;
@@ -233,3 +234,5 @@ protected:
} // namespace vectorized
} // namespace doris
+
+#include "common/compile_check_end.h"
diff --git a/be/src/vec/sink/vmysql_result_writer.cpp
b/be/src/vec/sink/vmysql_result_writer.cpp
index 932ee955590..d1e5baa860a 100644
--- a/be/src/vec/sink/vmysql_result_writer.cpp
+++ b/be/src/vec/sink/vmysql_result_writer.cpp
@@ -29,6 +29,7 @@
#include <string>
#include <utility>
+#include "common/cast_set.h"
#include "common/compiler_util.h" // IWYU pragma: keep
#include "common/config.h"
#include "gutil/integral_types.h"
@@ -70,6 +71,7 @@
#include "vec/runtime/vdatetime_value.h"
namespace doris {
+#include "common/compile_check_begin.h"
namespace vectorized {
template <bool is_binary_format>
@@ -143,7 +145,7 @@ Status VMysqlResultWriter<is_binary_format>::_set_options(
template <bool is_binary_format>
Status VMysqlResultWriter<is_binary_format>::_write_one_block(RuntimeState*
state, Block& block) {
Status status = Status::OK();
- auto num_rows = block.rows();
+ int num_rows = cast_set<int>(block.rows());
// convert one batch
auto result = std::make_unique<TFetchDataResult>();
result->result_batch.rows.resize(num_rows);
@@ -200,7 +202,7 @@ Status
VMysqlResultWriter<is_binary_format>::_write_one_block(RuntimeState* stat
}
}
- for (size_t row_idx = 0; row_idx < num_rows; ++row_idx) {
+ for (int row_idx = 0; row_idx < num_rows; ++row_idx) {
for (size_t col_idx = 0; col_idx < num_cols; ++col_idx) {
RETURN_IF_ERROR(arguments[col_idx].serde->write_column_to_mysql(
*(arguments[col_idx].column), row_buffer, row_idx,
diff --git a/be/src/vec/sink/vmysql_result_writer.h
b/be/src/vec/sink/vmysql_result_writer.h
index b89b8cf1b90..1c7da4f4b37 100644
--- a/be/src/vec/sink/vmysql_result_writer.h
+++ b/be/src/vec/sink/vmysql_result_writer.h
@@ -31,6 +31,7 @@
#include "vec/exprs/vexpr_fwd.h"
namespace doris {
+#include "common/compile_check_begin.h"
class BufferControlBlock;
class RuntimeState;
@@ -96,3 +97,5 @@ private:
};
} // namespace vectorized
} // namespace doris
+
+#include "common/compile_check_end.h"
diff --git a/be/src/vec/sink/vrow_distribution.cpp
b/be/src/vec/sink/vrow_distribution.cpp
index b79df49f062..3c15dbc8f0f 100644
--- a/be/src/vec/sink/vrow_distribution.cpp
+++ b/be/src/vec/sink/vrow_distribution.cpp
@@ -42,6 +42,7 @@
#include "vec/sink/writer/vtablet_writer.h"
namespace doris::vectorized {
+#include "common/compile_check_begin.h"
std::pair<vectorized::VExprContextSPtrs, vectorized::VExprSPtrs>
VRowDistribution::_get_partition_function() {
@@ -299,7 +300,7 @@ Status VRowDistribution::_filter_block(vectorized::Block*
block,
Status VRowDistribution::_generate_rows_distribution_for_non_auto_partition(
vectorized::Block* block, bool has_filtered_rows,
std::vector<RowPartTabletIds>& row_part_tablet_ids) {
- auto num_rows = block->rows();
+ int num_rows = cast_set<int>(block->rows());
bool stop_processing = false;
RETURN_IF_ERROR(_tablet_finder->find_tablets(_state, block, num_rows,
_partitions,
@@ -318,7 +319,7 @@ Status
VRowDistribution::_deal_missing_map(vectorized::Block* block,
int64_t& rows_stat_val) {
// for missing partition keys, calc the missing partition and save in
_partitions_need_create
auto [part_ctxs, part_exprs] = _get_partition_function();
- auto part_col_num = part_exprs.size();
+ int part_col_num = cast_set<int>(part_exprs.size());
// the two vectors are in column-first-order
std::vector<std::vector<std::string>> col_strs;
std::vector<const NullMap*> col_null_maps;
@@ -363,7 +364,7 @@ Status
VRowDistribution::_generate_rows_distribution_for_auto_partition(
vectorized::Block* block, const std::vector<uint16_t>&
partition_cols_idx,
bool has_filtered_rows, std::vector<RowPartTabletIds>&
row_part_tablet_ids,
int64_t& rows_stat_val) {
- auto num_rows = block->rows();
+ int num_rows = cast_set<int>(block->rows());
std::vector<uint16_t> partition_keys = _vpartition->get_partition_keys();
auto& partition_col = block->get_by_position(partition_keys[0]);
@@ -393,7 +394,7 @@ Status
VRowDistribution::_generate_rows_distribution_for_auto_overwrite(
vectorized::Block* block, const std::vector<uint16_t>&
partition_cols_idx,
bool has_filtered_rows, std::vector<RowPartTabletIds>&
row_part_tablet_ids,
int64_t& rows_stat_val) {
- auto num_rows = block->rows();
+ int num_rows = cast_set<int>(block->rows());
// for non-auto-partition situation, goes into two 'else' branch. just
find the origin partitions, replace them by rpc,
// and find the new partitions to use.
@@ -504,7 +505,7 @@ Status VRowDistribution::generate_rows_distribution(
VLOG_DEBUG << "Partition-calculated block:" << block->dump_data(0,
1);
DCHECK(result_idx != -1);
- partition_cols_idx.push_back(result_idx);
+ partition_cols_idx.push_back(cast_set<uint16_t>(result_idx));
}
// change the column to compare to transformed.
diff --git a/be/src/vec/sink/vrow_distribution.h
b/be/src/vec/sink/vrow_distribution.h
index 88002c3c211..87fd801984a 100644
--- a/be/src/vec/sink/vrow_distribution.h
+++ b/be/src/vec/sink/vrow_distribution.h
@@ -40,6 +40,7 @@
#include "vec/sink/vtablet_finder.h"
namespace doris::vectorized {
+#include "common/compile_check_begin.h"
class IndexChannel;
class VNodeChannel;
@@ -230,3 +231,5 @@ private:
};
} // namespace doris::vectorized
+
+#include "common/compile_check_end.h"
diff --git a/be/src/vec/sink/vtablet_block_convertor.cpp
b/be/src/vec/sink/vtablet_block_convertor.cpp
index 820759af2e4..26de6ea6c7e 100644
--- a/be/src/vec/sink/vtablet_block_convertor.cpp
+++ b/be/src/vec/sink/vtablet_block_convertor.cpp
@@ -55,6 +55,7 @@
#include "vec/exprs/vexpr_context.h"
namespace doris::vectorized {
+#include "common/compile_check_begin.h"
Status OlapTableBlockConvertor::validate_and_convert_block(
RuntimeState* state, vectorized::Block* input_block,
@@ -186,11 +187,11 @@ DecimalType
OlapTableBlockConvertor::_get_decimalv3_min_or_max(const TypeDescrip
Status OlapTableBlockConvertor::_internal_validate_column(
RuntimeState* state, const TypeDescriptor& type, bool is_nullable,
vectorized::ColumnPtr column, size_t slot_index, bool* stop_processing,
- fmt::memory_buffer& error_prefix, const uint32_t row_count,
+ fmt::memory_buffer& error_prefix, const size_t row_count,
vectorized::IColumn::Permutation* rows) {
DCHECK((rows == nullptr) || (rows->size() == row_count));
fmt::memory_buffer error_msg;
- auto set_invalid_and_append_error_msg = [&](int row) {
+ auto set_invalid_and_append_error_msg = [&](size_t row) {
_filter_map[row] = true;
auto ret = state->append_error_msg_to_file([]() -> std::string {
return ""; },
[&error_prefix,
&error_msg]() -> std::string {
@@ -218,7 +219,7 @@ Status OlapTableBlockConvertor::_internal_validate_column(
auto* __restrict offsets = column_string->get_offsets().data();
int invalid_count = 0;
- for (int j = 0; j < row_count; ++j) {
+ for (int64_t j = 0; j < row_count; ++j) {
invalid_count += (offsets[j] - offsets[j - 1]) > limit;
}
@@ -452,7 +453,7 @@ Status OlapTableBlockConvertor::_internal_validate_column(
}
Status OlapTableBlockConvertor::_validate_data(RuntimeState* state,
vectorized::Block* block,
- const uint32_t rows, int&
filtered_rows,
+ const size_t rows, int&
filtered_rows,
bool* stop_processing) {
for (int i = 0; i < _output_tuple_desc->slots().size(); ++i) {
SlotDescriptor* desc = _output_tuple_desc->slots()[i];
diff --git a/be/src/vec/sink/vtablet_block_convertor.h
b/be/src/vec/sink/vtablet_block_convertor.h
index 7f866c38032..16921e082dc 100644
--- a/be/src/vec/sink/vtablet_block_convertor.h
+++ b/be/src/vec/sink/vtablet_block_convertor.h
@@ -36,6 +36,7 @@
#include "vec/sink/autoinc_buffer.h"
namespace doris::vectorized {
+#include "common/compile_check_begin.h"
class OlapTableBlockConvertor {
public:
@@ -68,7 +69,7 @@ private:
Status _validate_column(RuntimeState* state, const TypeDescriptor& type,
bool is_nullable,
vectorized::ColumnPtr column, size_t slot_index,
bool* stop_processing,
- fmt::memory_buffer& error_prefix, const uint32_t
row_count,
+ fmt::memory_buffer& error_prefix, const size_t
row_count,
vectorized::IColumn::Permutation* rows = nullptr) {
RETURN_IF_CATCH_EXCEPTION({
return _internal_validate_column(state, type, is_nullable, column,
slot_index,
@@ -79,14 +80,14 @@ private:
Status _internal_validate_column(RuntimeState* state, const
TypeDescriptor& type,
bool is_nullable, vectorized::ColumnPtr
column,
size_t slot_index, bool* stop_processing,
- fmt::memory_buffer& error_prefix, const
uint32_t row_count,
+ fmt::memory_buffer& error_prefix, const
size_t row_count,
vectorized::IColumn::Permutation* rows =
nullptr);
// make input data valid for OLAP table
// return number of invalid/filtered rows.
// invalid row number is set in Bitmap
// set stop_processing if we want to stop the whole process now.
- Status _validate_data(RuntimeState* state, vectorized::Block* block, const
uint32_t rows,
+ Status _validate_data(RuntimeState* state, vectorized::Block* block, const
size_t rows,
int& filtered_rows, bool* stop_processing);
// some output column of output expr may have different nullable property
with dest slot desc
@@ -123,4 +124,5 @@ private:
bool _is_partial_update_and_auto_inc = false;
};
-} // namespace doris::vectorized
\ No newline at end of file
+} // namespace doris::vectorized
+#include "common/compile_check_end.h"
diff --git a/be/src/vec/sink/vtablet_finder.cpp
b/be/src/vec/sink/vtablet_finder.cpp
index 3bfd5bb4d22..c72da75d02a 100644
--- a/be/src/vec/sink/vtablet_finder.cpp
+++ b/be/src/vec/sink/vtablet_finder.cpp
@@ -32,6 +32,7 @@
#include "vec/core/block.h"
namespace doris::vectorized {
+#include "common/compile_check_begin.h"
Status OlapTabletFinder::find_tablets(RuntimeState* state, Block* block, int
rows,
std::vector<VOlapTablePartition*>&
partitions,
std::vector<uint32_t>& tablet_index,
bool& stop_processing,
diff --git a/be/src/vec/sink/vtablet_finder.h b/be/src/vec/sink/vtablet_finder.h
index 24f8e357e28..67eb7f08e3e 100644
--- a/be/src/vec/sink/vtablet_finder.h
+++ b/be/src/vec/sink/vtablet_finder.h
@@ -27,6 +27,7 @@
#include "vec/core/block.h"
namespace doris::vectorized {
+#include "common/compile_check_begin.h"
class OlapTabletFinder {
public:
@@ -75,4 +76,5 @@ private:
Bitmap _filter_bitmap;
};
-} // namespace doris::vectorized
\ No newline at end of file
+} // namespace doris::vectorized
+#include "common/compile_check_end.h"
diff --git a/be/test/io/fs/stream_sink_file_writer_test.cpp
b/be/test/io/fs/stream_sink_file_writer_test.cpp
index 69f286b205b..ef0a75288eb 100644
--- a/be/test/io/fs/stream_sink_file_writer_test.cpp
+++ b/be/test/io/fs/stream_sink_file_writer_test.cpp
@@ -59,7 +59,7 @@ class StreamSinkFileWriterTest : public testing::Test {
// APPEND_DATA
virtual Status append_data(int64_t partition_id, int64_t index_id,
int64_t tablet_id,
- int64_t segment_id, uint64_t offset,
std::span<const Slice> data,
+ int32_t segment_id, uint64_t offset,
std::span<const Slice> data,
bool segment_eos = false,
FileType file_type =
FileType::SEGMENT_FILE) override {
EXPECT_EQ(PARTITION_ID, partition_id);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
