From d1f1ad4c489d754912afd7a232c91097ce152984 Mon Sep 17 00:00:00 2001 From: meiyi Date: Thu, 26 Sep 2024 17:35:34 +0800 Subject: [PATCH] fix checkstyle --- be/src/cloud/cloud_tablet.cpp | 3 +-- be/src/olap/base_tablet.h | 3 ++- be/src/olap/parallel_scanner_builder.cpp | 3 ++- be/src/olap/tablet.cpp | 7 +++---- be/src/olap/txn_manager.cpp | 3 +-- cloud/src/meta-service/meta_service.cpp | 3 +-- 6 files changed, 10 insertions(+), 12 deletions(-) diff --git a/be/src/cloud/cloud_tablet.cpp b/be/src/cloud/cloud_tablet.cpp index 1d6d3eeb46ed8d..d8f50697ec25bf 100644 --- a/be/src/cloud/cloud_tablet.cpp +++ b/be/src/cloud/cloud_tablet.cpp @@ -138,8 +138,7 @@ Status CloudTablet::capture_sub_txn_rs_readers(int64_t version, auto res = rowset->create_reader(&rs_reader); if (!res.ok()) { return Status::Error( - "failed to create reader for rowset:{}", - rowset->rowset_id().to_string()); + "failed to create reader for rowset:{}", rowset->rowset_id().to_string()); } rs_splits->emplace_back(std::move(rs_reader)); } diff --git a/be/src/olap/base_tablet.h b/be/src/olap/base_tablet.h index 9a15681182bb8d..e80f16f5459e62 100644 --- a/be/src/olap/base_tablet.h +++ b/be/src/olap/base_tablet.h @@ -104,7 +104,8 @@ class BaseTablet { std::vector* rs_splits, bool skip_missing_version) = 0; - virtual Status capture_sub_txn_rs_readers(int64_t version, const std::vector& sub_txn_ids, + virtual Status capture_sub_txn_rs_readers(int64_t version, + const std::vector& sub_txn_ids, std::vector* rs_splits) = 0; virtual size_t tablet_footprint() = 0; diff --git a/be/src/olap/parallel_scanner_builder.cpp b/be/src/olap/parallel_scanner_builder.cpp index db94893b44a0cf..11241104c1fc14 100644 --- a/be/src/olap/parallel_scanner_builder.cpp +++ b/be/src/olap/parallel_scanner_builder.cpp @@ -172,7 +172,8 @@ Status ParallelScannerBuilder::_load() { const auto tablet_id = tablet->tablet_id(); auto& read_source = _all_read_sources[tablet_id]; if (sub_txn_ids.empty()) { - RETURN_IF_ERROR(tablet->capture_rs_readers({0, version}, &read_source.rs_splits, false)); + RETURN_IF_ERROR( + tablet->capture_rs_readers({0, version}, &read_source.rs_splits, false)); } else { if (version > 0) { RETURN_IF_ERROR( diff --git a/be/src/olap/tablet.cpp b/be/src/olap/tablet.cpp index 2ed1baa8056b9a..31a844227da487 100644 --- a/be/src/olap/tablet.cpp +++ b/be/src/olap/tablet.cpp @@ -941,8 +941,8 @@ Status Tablet::capture_sub_txn_rs_readers(int64_t version, const std::vectorrowset_id().to_string()); + "failed to create reader for rowset:{}", rowset->rowset_id().to_string()); } rs_splits->emplace_back(std::move(rs_reader)); } diff --git a/be/src/olap/txn_manager.cpp b/be/src/olap/txn_manager.cpp index 226dd481d7fbf2..13178876aa3a92 100644 --- a/be/src/olap/txn_manager.cpp +++ b/be/src/olap/txn_manager.cpp @@ -792,8 +792,7 @@ void TxnManager::get_all_related_tablets(std::set* tablet_infos) { } RowsetSharedPtr TxnManager::get_tablet_rowset(TTabletId tablet_id, TabletUid tablet_uid, - int64_t partition_id, - TTransactionId transaction_id) { + int64_t partition_id, TTransactionId transaction_id) { pair key(partition_id, transaction_id); std::shared_lock txn_rdlock(_get_txn_map_lock(transaction_id)); txn_tablet_map_t& txn_tablet_map = _get_txn_tablet_map(transaction_id); diff --git a/cloud/src/meta-service/meta_service.cpp b/cloud/src/meta-service/meta_service.cpp index a12562d37b6642..5237330d74f419 100644 --- a/cloud/src/meta-service/meta_service.cpp +++ b/cloud/src/meta-service/meta_service.cpp @@ -1502,8 +1502,7 @@ void MetaServiceImpl::get_tmp_rowset(::google::protobuf::RpcController* controll it != version_to_schema.end()) { rowset_meta->mutable_tablet_schema()->CopyFrom(*it->second); } else { - auto key = meta_schema_key( - {instance_id, index_id, rowset_meta->schema_version()}); + auto key = meta_schema_key({instance_id, index_id, rowset_meta->schema_version()}); if (!try_fetch_and_parse_schema(txn.get(), *rowset_meta, key, code, msg)) { return; }