You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by mo...@apache.org on 2023/06/14 14:36:43 UTC
[doris] branch branch-1.2-lts updated: [branch1.2] fix BE code style and p0 test case
This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch branch-1.2-lts
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-1.2-lts by this push:
new 50d77cc193 [branch1.2] fix BE code style and p0 test case
50d77cc193 is described below
commit 50d77cc193e44728a7ff087117a1654d936f0073
Author: morningman <mo...@163.com>
AuthorDate: Wed Jun 14 18:42:37 2023 +0800
[branch1.2] fix BE code style and p0 test case
---
be/src/exec/tablet_sink.cpp | 8 +++-----
.../suites/load_p0/broker_load/test_broker_load.groovy | 7 +++----
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/be/src/exec/tablet_sink.cpp b/be/src/exec/tablet_sink.cpp
index 4c7aa8e020..699748d365 100644
--- a/be/src/exec/tablet_sink.cpp
+++ b/be/src/exec/tablet_sink.cpp
@@ -809,9 +809,7 @@ Status IndexChannel::check_tablet_received_rows_consistency() {
OlapTableSink::OlapTableSink(ObjectPool* pool, const RowDescriptor& row_desc,
const std::vector<TExpr>& texprs, Status* status)
- : _pool(pool),
- _input_row_desc(row_desc),
- _filter_bitmap(1024) {
+ : _pool(pool), _input_row_desc(row_desc), _filter_bitmap(1024) {
if (!_is_vectorized) {
if (!texprs.empty()) {
*status = Expr::create_expr_trees(_pool, texprs, &_output_expr_ctxs);
@@ -1478,11 +1476,11 @@ void OlapTableSink::send_batch_process() {
SCOPED_TIMER(_non_blocking_send_timer);
SCOPED_ATTACH_TASK(_state);
SCOPED_CONSUME_MEM_TRACKER(_mem_tracker);
- while(true) {
+ while (true) {
int running_channels_num = 0;
for (auto index_channel : _channels) {
index_channel->for_each_node_channel([&running_channels_num,
- this](const std::shared_ptr<NodeChannel>& ch) {
+ this](const std::shared_ptr<NodeChannel>& ch) {
running_channels_num +=
ch->try_send_and_fetch_status(_state, this->_send_batch_thread_pool_token);
});
diff --git a/regression-test/suites/load_p0/broker_load/test_broker_load.groovy b/regression-test/suites/load_p0/broker_load/test_broker_load.groovy
index e67397e821..d5ea548910 100644
--- a/regression-test/suites/load_p0/broker_load/test_broker_load.groovy
+++ b/regression-test/suites/load_p0/broker_load/test_broker_load.groovy
@@ -151,10 +151,10 @@ suite("test_broker_load", "p0") {
"",
"",
"",
- "type:LOAD_RUN_FAIL; msg:errCode = 2, detailMessage = failed to find default value expr for slot: x1",
+ "failed to find default value expr for slot: x1",
"",
"",
- "type:LOAD_RUN_FAIL; msg:errCode = 2, detailMessage = failed to find default value expr for slot: x1",
+ "failed to find default value expr for slot: x1",
"",
"",
"",
@@ -218,7 +218,7 @@ suite("test_broker_load", "p0") {
break;
}
if (result[0][2].equals("CANCELLED")) {
- assertTrue(error_msg[i] == result[0][7], "expected: " + error_msg[i] + ", actual: " + result[0][7] + ", label: $label")
+ assertTrue(result[0][7].contains(error_msg[i]), "expected: " + error_msg[i] + ", actual: " + result[0][7] + ", label: $label");
break;
}
Thread.sleep(1000)
@@ -235,7 +235,6 @@ suite("test_broker_load", "p0") {
order_qt_parquet_s3_case6 """select count(*) from parquet_s3_case6 where p_partkey < 100000"""
order_qt_parquet_s3_case7 """select count(*) from parquet_s3_case7 where col4=4"""
order_qt_parquet_s3_case8 """ select count(*) from parquet_s3_case8 where p_partkey=1"""
- order_qt_parquet_s3_case9 """ select * from parquet_s3_case9"""
} finally {
for (String table in tables) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org