database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[fix](tvf) fix the inconsistency between tvf backends function and show backends result (#19697)

Browse Source
This commit is contained in:
luozenglin
2023-05-17 22:55:46 +08:00
committed by GitHub
parent 082b7cce41
commit 60d5c82f44
6 changed files with 48 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
fe/fe-core/src/main/java/org/apache/doris/tablefunction/BackendsTableValuedFunction.java
View File

@ -41,30 +41,29 @@ public class BackendsTableValuedFunction extends MetadataTableValuedFunction {
private static final ImmutableMap<String, Integer> COLUMN_TO_INDEX = new ImmutableMap.Builder<String, Integer>()
.put("backendid", 0)
.put("cluster", 1)
.put("ip", 2)
.put("hostname", 3)
.put("heartbeatport", 4)
.put("beport", 5)
.put("httpport", 6)
.put("brpcport", 7)
.put("laststarttime", 8)
.put("lastheartbeat", 9)
.put("alive", 10)
.put("systemdecommissioned", 11)
.put("clusterdecommissioned", 12)
.put("tabletnum", 13)
.put("datausedcapacity", 14)
.put("availcapacity", 15)
.put("totalcapacity", 16)
.put("usedpct", 17)
.put("maxdiskusedpct", 18)
.put("remoteusedcapacity", 19)
.put("tag", 20)
.put("errmsg", 21)
.put("version", 22)
.put("status", 23)
.put("heartbeatfailurecounter", 24)
.put("noderole", 25)
.put("host", 2)
.put("heartbeatport", 3)
.put("beport", 4)
.put("httpport", 5)
.put("brpcport", 6)
.put("laststarttime", 7)
.put("lastheartbeat", 8)
.put("alive", 9)
.put("systemdecommissioned", 10)
.put("clusterdecommissioned", 11)
.put("tabletnum", 12)
.put("datausedcapacity", 13)
.put("availcapacity", 14)
.put("totalcapacity", 15)
.put("usedpct", 16)
.put("maxdiskusedpct", 17)
.put("remoteusedcapacity", 18)
.put("tag", 19)
.put("errmsg", 20)
.put("version", 21)
.put("status", 22)
.put("heartbeatfailurecounter", 23)
.put("noderole", 24)
.build();
public static Integer getColumnIndexFromColumnName(String columnName) {
@ -102,8 +101,7 @@ public class BackendsTableValuedFunction extends MetadataTableValuedFunction {
List<Column> resColumns = Lists.newArrayList();
resColumns.add(new Column("BackendId", ScalarType.createType(PrimitiveType.BIGINT)));
resColumns.add(new Column("Cluster", ScalarType.createStringType()));
resColumns.add(new Column("IP", ScalarType.createStringType()));
resColumns.add(new Column("HostName", ScalarType.createStringType()));
resColumns.add(new Column("Host", ScalarType.createStringType()));
resColumns.add(new Column("HeartbeatPort", ScalarType.createType(PrimitiveType.INT)));
resColumns.add(new Column("BePort", ScalarType.createType(PrimitiveType.INT)));
resColumns.add(new Column("HttpPort", ScalarType.createType(PrimitiveType.INT)));

5
fe/fe-core/src/main/java/org/apache/doris/tablefunction/MetadataGenerator.java
View File

@ -168,11 +168,6 @@ public class MetadataGenerator {
trow.addToColumnValue(new TCell().setLongVal(backendId));
trow.addToColumnValue(new TCell().setStringVal(backend.getOwnerClusterName()));
trow.addToColumnValue(new TCell().setStringVal(backend.getHost()));
if (backend.getHost() != null) {
trow.addToColumnValue(new TCell().setStringVal(backend.getHost()));
} else {
trow.addToColumnValue(new TCell().setStringVal(backend.getHost()));
}
if (Strings.isNullOrEmpty(backendsParam.cluster_name)) {
trow.addToColumnValue(new TCell().setIntVal(backend.getHeartbeatPort()));
trow.addToColumnValue(new TCell().setIntVal(backend.getBePort()));