You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by pe...@apache.org on 2022/02/15 12:51:53 UTC
[incubator-linkis] branch dev-1.1.0-datasource updated: [Fix] fix NPE in stream ops and remove some redundant code (#1470)
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.1.0-datasource
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.1.0-datasource by this push:
new 1e975fd [Fix] fix NPE in stream ops and remove some redundant code (#1470)
1e975fd is described below
commit 1e975fd1ac6bae3be61a4c5acf3d9b3ec36aa5f2
Author: legendtkl <ta...@gmail.com>
AuthorDate: Tue Feb 15 20:51:42 2022 +0800
[Fix] fix NPE in stream ops and remove some redundant code (#1470)
---
.../linkis/entrance/parser/AbstractEntranceParser.java | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/parser/AbstractEntranceParser.java b/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/parser/AbstractEntranceParser.java
index cd1986d..7a5f1d3 100644
--- a/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/parser/AbstractEntranceParser.java
+++ b/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/parser/AbstractEntranceParser.java
@@ -89,7 +89,7 @@ public abstract class AbstractEntranceParser extends EntranceParser {
jobRequest.setProgress("" + job.getProgress());
jobRequest.setStatus(job.getState().toString());
- jobRequest.setUpdatedTime(new Date(System.currentTimeMillis()));
+ jobRequest.setUpdatedTime(new Date());
if (job.isCompleted()
&& !job.isSucceed()
&& job.getErrorResponse() != null
@@ -123,9 +123,9 @@ public abstract class AbstractEntranceParser extends EntranceParser {
.equalsIgnoreCase(
LabelKeyConstant.USER_CREATOR_TYPE_KEY))
.findFirst()
- .orElseGet(null);
+ .orElse(null);
if (null != userCreateLabel) {
- job.setCreator(userCreateLabel.getStringValue().split("\\-")[1]);
+ job.setCreator(userCreateLabel.getStringValue().split("-")[1]);
} else {
String msg =
"JobRequest doesn't hava valid userCreator label. labels : "
@@ -139,7 +139,6 @@ public abstract class AbstractEntranceParser extends EntranceParser {
Map<String, Object> properties = TaskUtils.getRuntimeMap(job.getParams());
properties.put(GovernanceConstant.TASK_SOURCE_MAP_KEY(), jobReq.getSource());
job.setEntranceListenerBus(entranceContext.getOrCreateEventListenerBus());
- // job.setEntranceLogListenerBus(entranceContext.getOrCreateLogListenerBus());
job.setEntranceContext(entranceContext);
job.setListenerEventBus(null);
job.setProgress(0f);
@@ -151,12 +150,12 @@ public abstract class AbstractEntranceParser extends EntranceParser {
l.getLabelKey()
.equalsIgnoreCase(LabelKeyConstant.CODE_TYPE_KEY))
.findFirst()
- .orElseGet(null);
+ .orElse(null);
if (null != codeTypeLabel) {
CodeParser codeParser =
CodeParserFactory.getCodeParser(
CodeType.getType(codeTypeLabel.getStringValue()));
- if (null != codeParser && !isNoNeedParser(codeTypeLabel)) {
+ if (null != codeParser && !isNoNeedParser()) {
job.setCodeParser(codeParser);
} else {
job.setCodeParser(new EmptyCodeParser());
@@ -165,7 +164,7 @@ public abstract class AbstractEntranceParser extends EntranceParser {
return job;
}
- private boolean isNoNeedParser(Label<?> codeTypeLabel) {
+ private boolean isNoNeedParser() {
return !EntranceConfiguration.ENTRANCE_CODEPARSER_ENABLE().getValue();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org