This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a change to branch dev-1.3.1
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
from 56b43ef4c [Optimize] replace the reference of EurekaServiceInstance
(#3773)
add 61fd1294e feat: merge linkis-orchestrator-ecm-plugin into
linkis-computation-orchestrator (#3770)
No new revisions were added by this update.
Summary of changes:
.../common/conf/GovernaceCommonConf.scala | 4 +-
.../linkis/ecm/server/conf/ECMConfiguration.scala | 2 +-
.../impl/AbstractEngineConnLaunchService.scala | 38 +++++++---
.../service/impl/DefaultECMHealthService.scala | 2 +-
.../service/impl/DefaultECMRegisterService.scala | 4 +-
.../DefaultEngineConnStatusCallbackService.scala | 4 +-
.../impl/ProcessEngineConnLaunchService.scala | 4 +-
.../executor/service/DefaultManagerService.scala | 17 +++--
.../linkis-entrance/pom.xml | 6 --
.../linkis-code-orchestrator/pom.xml | 3 +-
.../linkis-computation-orchestrator/pom.xml | 10 +--
.../computation/utils/TaskTreeUtil.java | 3 +-
.../linkis/orchestrator/ecm/entity/Policy.java | 0
.../computation/monitor/EngineConnMonitor.scala | 41 +++++++----
.../progress/AbstractProgressOperation.scala | 8 +--
.../ecm/ComputationEngineConnManager.scala | 27 +++----
.../orchestrator/ecm/EngineConnManager.scala | 0
.../ecm/EngineConnManagerBuilder.scala | 0
.../ecm/LoadBalanceLabelEngineConnManager.scala | 0
.../ecm/cache/EngineAsyncResponseCache.scala | 2 +-
.../orchestrator/ecm/conf/ECMPluginConf.scala | 0
.../linkis/orchestrator/ecm/entity/Mark.scala | 0
.../linkis/orchestrator/ecm/entity/MarkReq.scala | 13 ++--
.../ecm/exception/ECMPluginErrorException.scala | 0
.../ecm/service/EngineAsyncResponseService.scala | 0
.../ecm/service/EngineConnExecutor.scala | 0
.../ecm/service/TaskExecutionReceiver.scala | 0
.../impl/ComputationEngineConnExecutor.scala | 44 ++++++++----
.../impl/DefaultEngineAsyncResponseService.scala | 0
.../linkis/orchestrator/ecm/utils/ECMPUtils.scala | 0
.../linkis-orchestrator-core/pom.xml | 3 +-
.../plugin/linkis-orchestrator-ecm-plugin/pom.xml | 83 ----------------------
linkis-orchestrator/pom.xml | 1 -
33 files changed, 141 insertions(+), 178 deletions(-)
rename linkis-orchestrator/{plugin/linkis-orchestrator-ecm-plugin =>
linkis-computation-orchestrator}/src/main/java/org/apache/linkis/orchestrator/ecm/entity/Policy.java
(100%)
rename linkis-orchestrator/{plugin/linkis-orchestrator-ecm-plugin =>
linkis-computation-orchestrator}/src/main/scala/org/apache/linkis/orchestrator/ecm/ComputationEngineConnManager.scala
(85%)
rename linkis-orchestrator/{plugin/linkis-orchestrator-ecm-plugin =>
linkis-computation-orchestrator}/src/main/scala/org/apache/linkis/orchestrator/ecm/EngineConnManager.scala
(100%)
rename linkis-orchestrator/{plugin/linkis-orchestrator-ecm-plugin =>
linkis-computation-orchestrator}/src/main/scala/org/apache/linkis/orchestrator/ecm/EngineConnManagerBuilder.scala
(100%)
rename linkis-orchestrator/{plugin/linkis-orchestrator-ecm-plugin =>
linkis-computation-orchestrator}/src/main/scala/org/apache/linkis/orchestrator/ecm/LoadBalanceLabelEngineConnManager.scala
(100%)
rename linkis-orchestrator/{plugin/linkis-orchestrator-ecm-plugin =>
linkis-computation-orchestrator}/src/main/scala/org/apache/linkis/orchestrator/ecm/cache/EngineAsyncResponseCache.scala
(98%)
rename linkis-orchestrator/{plugin/linkis-orchestrator-ecm-plugin =>
linkis-computation-orchestrator}/src/main/scala/org/apache/linkis/orchestrator/ecm/conf/ECMPluginConf.scala
(100%)
rename linkis-orchestrator/{plugin/linkis-orchestrator-ecm-plugin =>
linkis-computation-orchestrator}/src/main/scala/org/apache/linkis/orchestrator/ecm/entity/Mark.scala
(100%)
rename linkis-orchestrator/{plugin/linkis-orchestrator-ecm-plugin =>
linkis-computation-orchestrator}/src/main/scala/org/apache/linkis/orchestrator/ecm/entity/MarkReq.scala
(95%)
rename linkis-orchestrator/{plugin/linkis-orchestrator-ecm-plugin =>
linkis-computation-orchestrator}/src/main/scala/org/apache/linkis/orchestrator/ecm/exception/ECMPluginErrorException.scala
(100%)
rename linkis-orchestrator/{plugin/linkis-orchestrator-ecm-plugin =>
linkis-computation-orchestrator}/src/main/scala/org/apache/linkis/orchestrator/ecm/service/EngineAsyncResponseService.scala
(100%)
rename linkis-orchestrator/{plugin/linkis-orchestrator-ecm-plugin =>
linkis-computation-orchestrator}/src/main/scala/org/apache/linkis/orchestrator/ecm/service/EngineConnExecutor.scala
(100%)
rename linkis-orchestrator/{plugin/linkis-orchestrator-ecm-plugin =>
linkis-computation-orchestrator}/src/main/scala/org/apache/linkis/orchestrator/ecm/service/TaskExecutionReceiver.scala
(100%)
rename linkis-orchestrator/{plugin/linkis-orchestrator-ecm-plugin =>
linkis-computation-orchestrator}/src/main/scala/org/apache/linkis/orchestrator/ecm/service/impl/ComputationEngineConnExecutor.scala
(78%)
rename linkis-orchestrator/{plugin/linkis-orchestrator-ecm-plugin =>
linkis-computation-orchestrator}/src/main/scala/org/apache/linkis/orchestrator/ecm/service/impl/DefaultEngineAsyncResponseService.scala
(100%)
rename linkis-orchestrator/{plugin/linkis-orchestrator-ecm-plugin =>
linkis-computation-orchestrator}/src/main/scala/org/apache/linkis/orchestrator/ecm/utils/ECMPUtils.scala
(100%)
delete mode 100644
linkis-orchestrator/plugin/linkis-orchestrator-ecm-plugin/pom.xml
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
