From a17a32ebd4e84af53d585e5cf2ab7a86d3a8072d Mon Sep 17 00:00:00 2001 From: YueW <45946325+Tanya-W@users.noreply.github.com> Date: Mon, 20 Feb 2023 11:59:06 +0800 Subject: [PATCH] [improve](show alter) add more infos to 'show alter' result for schema change job (#16843) --- .../apache/doris/alter/SchemaChangeJobV2.java | 16 ++++++++++++++++ .../doris/common/proc/SchemaChangeProcDir.java | 1 + 2 files changed, 17 insertions(+) diff --git a/fe/fe-core/src/main/java/org/apache/doris/alter/SchemaChangeJobV2.java b/fe/fe-core/src/main/java/org/apache/doris/alter/SchemaChangeJobV2.java index 2af14cea2c..637c583b47 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/alter/SchemaChangeJobV2.java +++ b/fe/fe-core/src/main/java/org/apache/doris/alter/SchemaChangeJobV2.java @@ -992,6 +992,7 @@ public class SchemaChangeJobV2 extends AlterJobV2 { info.add(errMsg); info.add(progress); info.add(timeoutMs / 1000); + info.add(getOtherInfo()); infos.add(info); } } @@ -1012,6 +1013,21 @@ public class SchemaChangeJobV2 extends AlterJobV2 { return taskInfos; } + public String getOtherInfo() { + String info = null; + // can add info as needed + List infoList = Lists.newArrayList(); + if (invertedIndexChange) { + String invertedIndexChangeInfo = ""; + for (Index invertedIndex : alterInvertedIndexes) { + invertedIndexChangeInfo += "[" + (isDropOp ? "DROP " : "ADD ") + invertedIndex.toString() + "], "; + } + infoList.add(invertedIndexChangeInfo); + } + info = Joiner.on(", ").join(infoList.subList(0, infoList.size())); + return info; + } + @Override public void write(DataOutput out) throws IOException { String json = GsonUtils.GSON.toJson(this, AlterJobV2.class); diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/proc/SchemaChangeProcDir.java b/fe/fe-core/src/main/java/org/apache/doris/common/proc/SchemaChangeProcDir.java index a2ff07f966..6bf05a02ae 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/proc/SchemaChangeProcDir.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/proc/SchemaChangeProcDir.java @@ -48,6 +48,7 @@ public class SchemaChangeProcDir implements ProcDirInterface { .add("JobId").add("TableName").add("CreateTime").add("FinishTime") .add("IndexName").add("IndexId").add("OriginIndexId").add("SchemaVersion") .add("TransactionId").add("State").add("Msg").add("Progress").add("Timeout") + .add("OtherInfos") .build(); private static final Logger LOG = LogManager.getLogger(SchemaChangeProcDir.class);