This is an automated email from the ASF dual-hosted git repository.
yiguolei 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 2e6d91aa99 [chore](block) temporarily disable DCHECK for column name
equality in MutableBlock (#21116)
2e6d91aa99 is described below
commit 2e6d91aa99cf7c67d38bdb2b565900023dac2521
Author: Kang <[email protected]>
AuthorDate: Mon Jun 26 10:49:27 2023 +0800
[chore](block) temporarily disable DCHECK for column name equality in
MutableBlock (#21116)
* tempororyly disable DCHECK for column name equality in
MutableBlock::add_rows
* num columns EQ to LE
---
be/src/vec/core/block.cpp | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/be/src/vec/core/block.cpp b/be/src/vec/core/block.cpp
index 517bfc411d..b59e9fa6c2 100644
--- a/be/src/vec/core/block.cpp
+++ b/be/src/vec/core/block.cpp
@@ -904,12 +904,10 @@ void MutableBlock::add_row(const Block* block, int row) {
}
void MutableBlock::add_rows(const Block* block, const int* row_begin, const
int* row_end) {
- DCHECK_EQ(columns(), block->columns());
+ DCHECK_LE(columns(), block->columns());
auto& block_data = block->get_columns_with_type_and_name();
for (size_t i = 0; i < _columns.size(); ++i) {
- // DCHECK(_columns[i]->get_data_type() ==
block_data[i].column->get_data_type());
DCHECK_EQ(_data_types[i]->get_name(), block_data[i].type->get_name());
- DCHECK_EQ(_names[i], block_data[i].name);
auto& dst = _columns[i];
auto& src = *block_data[i].column.get();
dst->insert_indices_from(src, row_begin, row_end);
@@ -917,12 +915,10 @@ void MutableBlock::add_rows(const Block* block, const
int* row_begin, const int*
}
void MutableBlock::add_rows(const Block* block, size_t row_begin, size_t
length) {
- DCHECK_EQ(columns(), block->columns());
+ DCHECK_LE(columns(), block->columns());
auto& block_data = block->get_columns_with_type_and_name();
for (size_t i = 0; i < _columns.size(); ++i) {
- // DCHECK(_columns[i]->get_data_type() ==
block_data[i].column->get_data_type());
DCHECK_EQ(_data_types[i]->get_name(), block_data[i].type->get_name());
- DCHECK_EQ(_names[i], block_data[i].name);
auto& dst = _columns[i];
auto& src = *block_data[i].column.get();
dst->insert_range_from(src, row_begin, length);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
