[linkis] branch dev-1.3.1 updated: Fix DSS compatiable with linkis 1.3.1 (#4070)

[casion]

This is an automated email from the ASF dual-hosted git repository.

casion pushed a commit to branch dev-1.3.1
in repository https://gitbox.apache.org/repos/asf/linkis.git


The following commit(s) were added to refs/heads/dev-1.3.1 by this push:
     new 7ccd4f0b1 Fix DSS compatiable with linkis 1.3.1 (#4070)
7ccd4f0b1 is described below

commit 7ccd4f0b122e2725d6d8275b88f24b4123660c54
Author: peacewong <wpeace1...@gmail.com>
AuthorDate: Thu Dec 29 14:33:26 2022 +0800

    Fix DSS compatiable with linkis 1.3.1 (#4070)
    
    * Fix DSS compatiable with linkis 1.3.1
---
 .../linkis-entrance/pom.xml                         |  1 -
 .../persistence/AbstractPersistenceEngine.java      | 21 ++++++++++++++++++++-
 .../entrance/persistence/PersistenceEngine.scala    | 16 +++++++++++++++-
 3 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/linkis-computation-governance/linkis-entrance/pom.xml 
b/linkis-computation-governance/linkis-entrance/pom.xml
index 4713dd584..4b2d971bc 100644
--- a/linkis-computation-governance/linkis-entrance/pom.xml
+++ b/linkis-computation-governance/linkis-entrance/pom.xml
@@ -31,7 +31,6 @@
       <groupId>org.apache.linkis</groupId>
       <artifactId>linkis-scheduler</artifactId>
       <version>${project.version}</version>
-      <scope>provided</scope>
       <exclusions>
         <exclusion>
           <groupId>org.apache.linkis</groupId>
diff --git 
a/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/persistence/AbstractPersistenceEngine.java
 
b/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/persistence/AbstractPersistenceEngine.java
index 5e232643f..a43a26b50 100644
--- 
a/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/persistence/AbstractPersistenceEngine.java
+++ 
b/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/persistence/AbstractPersistenceEngine.java
@@ -17,4 +17,23 @@
 
 package org.apache.linkis.entrance.persistence;
 
-public abstract class AbstractPersistenceEngine implements PersistenceEngine {}
+import org.apache.linkis.common.exception.ErrorException;
+import org.apache.linkis.governance.common.entity.job.SubJobDetail;
+import org.apache.linkis.governance.common.entity.job.SubJobInfo;
+
+public abstract class AbstractPersistenceEngine implements PersistenceEngine {
+
+  @Deprecated
+  @Override
+  public SubJobDetail retrieveJobDetailReq(Long jobDetailId) throws 
ErrorException {
+    return null;
+  }
+
+  @Deprecated
+  @Override
+  public void persist(SubJobInfo subjobInfo) throws ErrorException {}
+
+  @Deprecated
+  @Override
+  public void updateIfNeeded(SubJobInfo subJobInfo) throws ErrorException {}
+}
diff --git 
a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/persistence/PersistenceEngine.scala
 
b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/persistence/PersistenceEngine.scala
index 94814d1ee..79e5780f0 100644
--- 
a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/persistence/PersistenceEngine.scala
+++ 
b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/persistence/PersistenceEngine.scala
@@ -18,7 +18,7 @@
 package org.apache.linkis.entrance.persistence
 
 import org.apache.linkis.common.exception.ErrorException
-import org.apache.linkis.governance.common.entity.job.JobRequest
+import org.apache.linkis.governance.common.entity.job.{JobRequest, 
SubJobDetail, SubJobInfo}
 import org.apache.linkis.protocol.task.Task
 
 import java.io.{Closeable, Flushable}
@@ -33,6 +33,10 @@ trait PersistenceEngine extends Closeable with Flushable {
   @throws[ErrorException]
   def persist(jobReq: JobRequest): Unit
 
+  @deprecated
+  @throws[ErrorException]
+  def persist(subjobInfo: SubJobInfo): Unit = {}
+
   /**
    * If a task's progress, status, logs, and result set are updated, this 
method is updated <br>
    * 如果一个任务的进度、状态、日志和结果集发生更新，由此方法进行更新<br>
@@ -41,6 +45,10 @@ trait PersistenceEngine extends Closeable with Flushable {
   @throws[ErrorException]
   def updateIfNeeded(jobReq: JobRequest): Unit
 
+  @deprecated
+  @throws[ErrorException]
+  def updateIfNeeded(subJobInfo: SubJobInfo): Unit = {}
+
   /**
    * Used to hang up a unified import task through this method, and continue 
to do the processing.
    * 用于如果某一个统一入口挂掉了，通过这个方法，将挂掉的统一入口tasks读取过来，继续做处理
@@ -59,4 +67,10 @@ trait PersistenceEngine extends Closeable with Flushable {
   @throws[ErrorException]
   def retrieveJobReq(jobGroupId: java.lang.Long): JobRequest
 
+  @deprecated
+  @throws[ErrorException]
+  def retrieveJobDetailReq(jobDetailId: java.lang.Long): SubJobDetail = {
+    null
+  }
+
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@linkis.apache.org
For additional commands, e-mail: commits-h...@linkis.apache.org