From d8cb4da73d3895a8ec87a7f6ca6c66faed565a9d Mon Sep 17 00:00:00 2001 From: Gavin Chou Date: Sun, 24 Dec 2023 22:29:24 +0800 Subject: [PATCH] [chore](prompt) Optimize tablet and replica prompt by pointing out what the numbers mean (#28925) --- .../src/main/java/org/apache/doris/planner/OlapScanNode.java | 5 +++-- .../java/org/apache/doris/planner/ResourceTagQueryTest.java | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/OlapScanNode.java b/fe/fe-core/src/main/java/org/apache/doris/planner/OlapScanNode.java index 8d7a5c0ab261e6..a300b9eab742c9 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/planner/OlapScanNode.java +++ b/fe/fe-core/src/main/java/org/apache/doris/planner/OlapScanNode.java @@ -837,7 +837,8 @@ private void addScanRangeLocations(Partition partition, if (backend == null || !backend.isAlive()) { LOG.debug("backend {} not exists or is not alive for replica {}", replica.getBackendId(), replica.getId()); - errs.add(replica.getId() + "'s backend " + replica.getBackendId() + " does not exist or not alive"); + errs.add("replica " + replica.getId() + "'s backend " + replica.getBackendId() + + " does not exist or not alive"); continue; } if (!backend.isMixNode()) { @@ -875,7 +876,7 @@ private void addScanRangeLocations(Partition partition, } } if (tabletIsNull) { - throw new UserException(tabletId + " have no queryable replicas. err: " + throw new UserException("tablet " + tabletId + " has no queryable replicas. err: " + Joiner.on(", ").join(errs)); } TScanRange scanRange = new TScanRange(); diff --git a/fe/fe-core/src/test/java/org/apache/doris/planner/ResourceTagQueryTest.java b/fe/fe-core/src/test/java/org/apache/doris/planner/ResourceTagQueryTest.java index baf5486195fae4..5afe9c3b39b8b6 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/planner/ResourceTagQueryTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/planner/ResourceTagQueryTest.java @@ -225,7 +225,7 @@ public void test() throws Exception { Assert.assertTrue(connectContext.isResourceTagsSet()); queryStr = "explain select * from test.tbl1"; String error = UtFrameUtils.getSQLPlanOrErrorMsg(connectContext, queryStr); - Assert.assertTrue(error.contains("have no queryable replicas")); + Assert.assertTrue(error.contains("no queryable replicas")); // set [0, 1, 2] backends' tag to zone1, so that at least 1 replica can be queried. // set tag for all backends. 0-2 to zone1, 4 and 5 to zone2 @@ -320,7 +320,7 @@ public void test() throws Exception { queryStr = "explain select * from test_prop.tbl2"; explainString = UtFrameUtils.getSQLPlanOrErrorMsg(connectContext, queryStr); System.out.println(explainString); - Assert.assertTrue(explainString.contains("have no queryable replicas")); + Assert.assertTrue(explainString.contains("no queryable replicas")); // The priority of table is higher than db,should same with table String createTableStr3 = "create table test_prop.tbl3\n"