You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by sh...@apache.org on 2018/09/11 14:26:26 UTC
[kylin] branch 2.5.x updated (39ff93a -> beab5ce)
This is an automated email from the ASF dual-hosted git repository.
shaofengshi pushed a change to branch 2.5.x
in repository https://gitbox.apache.org/repos/asf/kylin.git.
from 39ff93a KYLIN-3547 Add DataTpyeOrder boolean
new 3e4cc84 KYLIN-3550 kylin.source.hive.flat-table-field-delimiter extra \
new b232ba5 KYLIN-3554 Kylin move to next step on Spark job resumed
new beab5ce minor, update front end error message
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/main/java/org/apache/kylin/job/JoinedFlatTable.java | 2 +-
.../java/org/apache/kylin/engine/spark/SparkExecutable.java | 13 +++++++++----
webapp/app/js/controllers/cube.js | 2 +-
3 files changed, 11 insertions(+), 6 deletions(-)
[kylin] 01/03: KYLIN-3550
kylin.source.hive.flat-table-field-delimiter extra \
Posted by sh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
shaofengshi pushed a commit to branch 2.5.x
in repository https://gitbox.apache.org/repos/asf/kylin.git
commit 3e4cc847f61708ab7fd007218ecdbb590bd32cd3
Author: shaofengshi <sh...@apache.org>
AuthorDate: Tue Sep 11 22:24:33 2018 +0800
KYLIN-3550 kylin.source.hive.flat-table-field-delimiter extra \
---
core-job/src/main/java/org/apache/kylin/job/JoinedFlatTable.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core-job/src/main/java/org/apache/kylin/job/JoinedFlatTable.java b/core-job/src/main/java/org/apache/kylin/job/JoinedFlatTable.java
index ea07835..86659d9 100644
--- a/core-job/src/main/java/org/apache/kylin/job/JoinedFlatTable.java
+++ b/core-job/src/main/java/org/apache/kylin/job/JoinedFlatTable.java
@@ -88,7 +88,7 @@ public class JoinedFlatTable {
}
ddl.append(")" + "\n");
if (TEXTFILE.equals(storageFormat)) {
- ddl.append("ROW FORMAT DELIMITED FIELDS TERMINATED BY '\\" + fieldDelimiter + "'\n");
+ ddl.append("ROW FORMAT DELIMITED FIELDS TERMINATED BY '" + fieldDelimiter + "'\n");
}
ddl.append("STORED AS " + storageFormat + "\n");
ddl.append("LOCATION '" + getTableDir(flatDesc, storageDfsDir) + "';").append("\n");
[kylin] 02/03: KYLIN-3554 Kylin move to next step on Spark job
resumed
Posted by sh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
shaofengshi pushed a commit to branch 2.5.x
in repository https://gitbox.apache.org/repos/asf/kylin.git
commit b232ba5f515ba9e459d44d98e231c00b390113a9
Author: shaofengshi <sh...@apache.org>
AuthorDate: Tue Sep 11 22:25:46 2018 +0800
KYLIN-3554 Kylin move to next step on Spark job resumed
---
.../java/org/apache/kylin/engine/spark/SparkExecutable.java | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/engine-spark/src/main/java/org/apache/kylin/engine/spark/SparkExecutable.java b/engine-spark/src/main/java/org/apache/kylin/engine/spark/SparkExecutable.java
index bc7df77..a354909 100644
--- a/engine-spark/src/main/java/org/apache/kylin/engine/spark/SparkExecutable.java
+++ b/engine-spark/src/main/java/org/apache/kylin/engine/spark/SparkExecutable.java
@@ -189,12 +189,14 @@ public class SparkExecutable extends AbstractExecutable {
}
+ @SuppressWarnings("checkstyle:methodlength")
@Override
protected ExecuteResult doWork(ExecutableContext context) throws ExecuteException {
ExecutableManager mgr = getManager();
Map<String, String> extra = mgr.getOutput(getId()).getExtra();
- if (extra.containsKey(ExecutableConstants.SPARK_JOB_ID)) {
- return onResumed(extra.get(ExecutableConstants.SPARK_JOB_ID), mgr);
+ String sparkJobId = extra.get(ExecutableConstants.SPARK_JOB_ID);
+ if (!StringUtils.isEmpty(sparkJobId)) {
+ return onResumed(sparkJobId, mgr);
} else {
String cubeName = this.getParam(SparkCubingByLayer.OPTION_CUBE_NAME.getOpt());
CubeInstance cube = CubeManager.getInstance(context.getConfig()).getCube(cubeName);
@@ -325,14 +327,17 @@ public class SparkExecutable extends AbstractExecutable {
Map<String, String> counterMap = HadoopUtil.readFromSequenceFile(counterOutput);
joblogInfo.putAll(counterMap);
} else {
- logger.warn("Spark counter output path not exists");
+ logger.warn("Spark counter output path not exists: " + counterOutput);
}
}
readCounters(joblogInfo);
getManager().addJobInfo(getId(), joblogInfo);
return new ExecuteResult(ExecuteResult.State.SUCCEED, patternedLogger.getBufferedLog());
}
-
+ // clear SPARK_JOB_ID on job failure.
+ extra = mgr.getOutput(getId()).getExtra();
+ extra.put(ExecutableConstants.SPARK_JOB_ID, "");
+ getManager().addJobInfo(getId(), extra);
return new ExecuteResult(ExecuteResult.State.ERROR, result != null ? result.getSecond() : "");
} catch (Exception e) {
logger.error("error run spark job:", e);
[kylin] 03/03: minor, update front end error message
Posted by sh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
shaofengshi pushed a commit to branch 2.5.x
in repository https://gitbox.apache.org/repos/asf/kylin.git
commit beab5ce6b668278d5a1607b4b35427c695c5a83c
Author: shaofengshi <sh...@apache.org>
AuthorDate: Tue Sep 11 22:26:00 2018 +0800
minor, update front end error message
---
webapp/app/js/controllers/cube.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/webapp/app/js/controllers/cube.js b/webapp/app/js/controllers/cube.js
index aff3226..60d141b 100755
--- a/webapp/app/js/controllers/cube.js
+++ b/webapp/app/js/controllers/cube.js
@@ -169,7 +169,7 @@ KylinApp.controller('CubeCtrl', function ($scope, $rootScope, AccessService, Mes
}
}, function(e) {
loadingRequest.hide();
- SweetAlert.swal('Oops...', 'Failed to get recommend cuboid.', 'error');
+ SweetAlert.swal('Oops...', 'Failed to get recommend Cuboid; Check whether you have enabled System Cube.', 'error');
console.error('recommend cuboid error', e.data);
});
} else {