From 5a85954bdf2a5e03a7becebac27070b45a7caecc Mon Sep 17 00:00:00 2001 From: Yongqiang YANG Date: Thu, 12 Sep 2024 11:59:46 +0800 Subject: [PATCH 1/4] [improve](stack) do not report stack for -230 --- be/src/olap/tablet.cpp | 4 ++-- be/src/olap/version_graph.cpp | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/be/src/olap/tablet.cpp b/be/src/olap/tablet.cpp index 66278afdb666ee..177bda19b17362 100644 --- a/be/src/olap/tablet.cpp +++ b/be/src/olap/tablet.cpp @@ -855,8 +855,8 @@ Status Tablet::capture_consistent_versions_unlocked(const Version& spec_version, << ", version already has been merged. spec_version: " << spec_version << ", max_version: " << max_version_unlocked(); } - status = Status::Error( - "missed_versions is empty, spec_version " + status = Status::Error( + "versions are already compacted, spec_version " "{}, max_version {}, tablet_id {}", spec_version.second, max_version_unlocked(), tablet_id()); } else { diff --git a/be/src/olap/version_graph.cpp b/be/src/olap/version_graph.cpp index abdf82d8953ebf..25c5837504f42e 100644 --- a/be/src/olap/version_graph.cpp +++ b/be/src/olap/version_graph.cpp @@ -566,8 +566,8 @@ void VersionGraph::_add_vertex_to_graph(int64_t vertex_value) { Status VersionGraph::capture_consistent_versions(const Version& spec_version, std::vector* version_path) const { if (spec_version.first > spec_version.second) { - return Status::Error("invalid specified version. spec_version={}-{}", - spec_version.first, spec_version.second); + return Status::Error("invalid specified version. spec_version={}-{}", + spec_version.first, spec_version.second); } int64_t cur_idx = -1; @@ -579,8 +579,8 @@ Status VersionGraph::capture_consistent_versions(const Version& spec_version, } if (cur_idx < 0) { - return Status::InternalError("failed to find path in version_graph. spec_version: {}-{}", - spec_version.first, spec_version.second); + return Status::InternalError("failed to find path in version_graph. spec_version: {}-{}", + spec_version.first, spec_version.second); } int64_t end_value = spec_version.second + 1; @@ -609,8 +609,8 @@ Status VersionGraph::capture_consistent_versions(const Version& spec_version, } cur_idx = next_idx; } else { - return Status::InternalError("fail to find path in version_graph. spec_version: {}-{}", - spec_version.first, spec_version.second); + return Status::InternalError("fail to find path in version_graph. spec_version: {}-{}", + spec_version.first, spec_version.second); } } From e06aacf24c0a2eb392ab99d07571e7ebfc4ccf34 Mon Sep 17 00:00:00 2001 From: Yongqiang YANG Date: Thu, 12 Sep 2024 12:02:34 +0800 Subject: [PATCH 2/4] format --- be/src/olap/version_graph.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/be/src/olap/version_graph.cpp b/be/src/olap/version_graph.cpp index 25c5837504f42e..6f6c422384aafa 100644 --- a/be/src/olap/version_graph.cpp +++ b/be/src/olap/version_graph.cpp @@ -566,8 +566,9 @@ void VersionGraph::_add_vertex_to_graph(int64_t vertex_value) { Status VersionGraph::capture_consistent_versions(const Version& spec_version, std::vector* version_path) const { if (spec_version.first > spec_version.second) { - return Status::Error("invalid specified version. spec_version={}-{}", - spec_version.first, spec_version.second); + return Status::Error( + "invalid specified version. spec_version={}-{}", + spec_version.first, spec_version.second); } int64_t cur_idx = -1; @@ -579,8 +580,9 @@ Status VersionGraph::capture_consistent_versions(const Version& spec_version, } if (cur_idx < 0) { - return Status::InternalError("failed to find path in version_graph. spec_version: {}-{}", - spec_version.first, spec_version.second); + return Status::InternalError( + "failed to find path in version_graph. spec_version: {}-{}", + spec_version.first, spec_version.second); } int64_t end_value = spec_version.second + 1; @@ -609,8 +611,9 @@ Status VersionGraph::capture_consistent_versions(const Version& spec_version, } cur_idx = next_idx; } else { - return Status::InternalError("fail to find path in version_graph. spec_version: {}-{}", - spec_version.first, spec_version.second); + return Status::InternalError( + "fail to find path in version_graph. spec_version: {}-{}", + spec_version.first, spec_version.second); } } From ae412d56863cf868f976138b7b07804d6f9742b0 Mon Sep 17 00:00:00 2001 From: Yongqiang YANG Date: Thu, 12 Sep 2024 12:04:42 +0800 Subject: [PATCH 3/4] fix --- be/src/olap/version_graph.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/be/src/olap/version_graph.cpp b/be/src/olap/version_graph.cpp index 6f6c422384aafa..010e7ce9fd89a5 100644 --- a/be/src/olap/version_graph.cpp +++ b/be/src/olap/version_graph.cpp @@ -567,8 +567,8 @@ Status VersionGraph::capture_consistent_versions(const Version& spec_version, std::vector* version_path) const { if (spec_version.first > spec_version.second) { return Status::Error( - "invalid specified version. spec_version={}-{}", - spec_version.first, spec_version.second); + "invalid specified version. spec_version={}-{}", spec_version.first, + spec_version.second); } int64_t cur_idx = -1; @@ -581,8 +581,8 @@ Status VersionGraph::capture_consistent_versions(const Version& spec_version, if (cur_idx < 0) { return Status::InternalError( - "failed to find path in version_graph. spec_version: {}-{}", - spec_version.first, spec_version.second); + "failed to find path in version_graph. spec_version: {}-{}", spec_version.first, + spec_version.second); } int64_t end_value = spec_version.second + 1; @@ -612,8 +612,8 @@ Status VersionGraph::capture_consistent_versions(const Version& spec_version, cur_idx = next_idx; } else { return Status::InternalError( - "fail to find path in version_graph. spec_version: {}-{}", - spec_version.first, spec_version.second); + "fail to find path in version_graph. spec_version: {}-{}", spec_version.first, + spec_version.second); } } From 4f0ed5d1bdae9bdea5119c1a45780f8f116e79a3 Mon Sep 17 00:00:00 2001 From: Yongqiang YANG Date: Thu, 12 Sep 2024 12:07:45 +0800 Subject: [PATCH 4/4] fix --- be/src/cloud/cloud_tablet.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/be/src/cloud/cloud_tablet.cpp b/be/src/cloud/cloud_tablet.cpp index 7433b781c65d99..f54e0afee37df4 100644 --- a/be/src/cloud/cloud_tablet.cpp +++ b/be/src/cloud/cloud_tablet.cpp @@ -96,6 +96,7 @@ Status CloudTablet::capture_rs_readers(const Version& spec_version, auto missed_versions = get_missed_versions(spec_version.second); if (missed_versions.empty()) { st.set_code(VERSION_ALREADY_MERGED); // Reset error code + st.append(" versions are already compacted, "); } st.append(" tablet_id=" + std::to_string(tablet_id())); // clang-format off