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 487eaed481 [branch1.2](clang-format) upgrade clang format version to
16 and fix code format
487eaed481 is described below
commit 487eaed481730ee703cdf6e01e70b4968a3b44d7
Author: morningman <[email protected]>
AuthorDate: Sat May 27 19:13:04 2023 +0800
[branch1.2](clang-format) upgrade clang format version to 16 and fix code
format
---
.github/workflows/clang-format.yml | 11 +++++------
be/src/exec/tablet_sink.cpp | 6 ++----
be/src/vec/exec/scan/vscan_node.cpp | 3 +--
3 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/.github/workflows/clang-format.yml
b/.github/workflows/clang-format.yml
index df4a75af2e..d676f171ca 100644
--- a/.github/workflows/clang-format.yml
+++ b/.github/workflows/clang-format.yml
@@ -18,9 +18,8 @@
---
name: BE Code Formatter
-on:
- pull_request:
- push:
+
+on: [push, pull_request]
jobs:
clang-format:
@@ -28,7 +27,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
with:
persist-credentials: false
submodules: recursive
@@ -47,8 +46,8 @@ jobs:
uses: ./.github/actions/clang-format-lint-action
id: be_clang_format
with:
- source: 'be/src be/test'
- clangFormatVersion: 15
+ source: "be/src be/test"
+ clangFormatVersion: 16
inplace: False
- name: Ignore it!
diff --git a/be/src/exec/tablet_sink.cpp b/be/src/exec/tablet_sink.cpp
index 493147de4d..542dfb2bee 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);
@@ -1482,7 +1480,7 @@ void OlapTableSink::send_batch_process() {
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/be/src/vec/exec/scan/vscan_node.cpp
b/be/src/vec/exec/scan/vscan_node.cpp
index e708c22997..0dd68ea0cb 100644
--- a/be/src/vec/exec/scan/vscan_node.cpp
+++ b/be/src/vec/exec/scan/vscan_node.cpp
@@ -186,8 +186,7 @@ Status VScanNode::_init_profile() {
Status VScanNode::_start_scanners(const std::list<VScanner*>& scanners) {
_scanner_ctx.reset(new ScannerContext(_state, this, _input_tuple_desc,
_output_tuple_desc,
- scanners, limit(),
- _state->scan_queue_mem_limit()));
+ scanners, limit(),
_state->scan_queue_mem_limit()));
RETURN_IF_ERROR(_scanner_ctx->init());
RETURN_IF_ERROR(_state->exec_env()->scanner_scheduler()->submit(_scanner_ctx.get()));
return Status::OK();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
