You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by xx...@apache.org on 2021/03/24 09:01:33 UTC
[kylin] branch kylin-on-parquet-v2 updated: KYLIN-4935 Existing
JobOutput's extend info will be lost when it is updated
This is an automated email from the ASF dual-hosted git repository.
xxyu pushed a commit to branch kylin-on-parquet-v2
in repository https://gitbox.apache.org/repos/asf/kylin.git
The following commit(s) were added to refs/heads/kylin-on-parquet-v2 by this push:
new c3765cd KYLIN-4935 Existing JobOutput's extend info will be lost when it is updated
c3765cd is described below
commit c3765cdaba3da961f99e68da4e6681dd72ebb768
Author: zhengshengjun <sh...@sina.com>
AuthorDate: Wed Mar 17 14:18:21 2021 +0800
KYLIN-4935 Existing JobOutput's extend info will be lost when it is updated
---
.../main/java/org/apache/kylin/job/execution/ExecutableManager.java | 6 +++++-
pom.xml | 2 ++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/core-job/src/main/java/org/apache/kylin/job/execution/ExecutableManager.java b/core-job/src/main/java/org/apache/kylin/job/execution/ExecutableManager.java
index 0bd7b6e..1c9e81c 100644
--- a/core-job/src/main/java/org/apache/kylin/job/execution/ExecutableManager.java
+++ b/core-job/src/main/java/org/apache/kylin/job/execution/ExecutableManager.java
@@ -675,7 +675,11 @@ public class ExecutableManager {
logger.info("job id:" + jobId + " from " + oldStatus + " to " + newStatus);
}
if (info != null) {
- jobOutput.setInfo(info);
+ if (null != jobOutput.getInfo()) {
+ jobOutput.getInfo().putAll(info);
+ } else {
+ jobOutput.setInfo(info);
+ }
}
if (output != null) {
if (output.length() > config.getJobOutputMaxSize()) {
diff --git a/pom.xml b/pom.xml
index 24ae280..d83b0fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1980,6 +1980,8 @@
<exclude>**/*.isproj</exclude>
<exclude>**/*.bmp</exclude>
+ <exclude>src/main/codegen/javacc/org/apache/kylin/query/util/CommentParser.jj</exclude>
+
<!-- protobuf generated -->
<exclude>
src/main/java/org/apache/kylin/storage/hbase/ii/coprocessor/endpoint/generated/IIProtos.java