This is an automated email from the ASF dual-hosted git repository.
alexkun pushed a change to branch dev-1.0.3
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git.
from d2fa8a3 Merge pull request #1211 from casionone/bugfix_4
new b4eca77 add update and startup time attributes to the node object
close #1200
new eb6c071 Remove the judgment logic of the queue name close #1207
new eaf9947 Method to increase the proportion of resources obtained close
#1208
new 4723716 Add id in the resource class
new 557ecf9 add userResource
new 2fb4317 Add em registration and cleanup requests close #1202
new 8b5a330 Optimize the toString method
new 58677e2 Merge branch 'dev-1.0.3' into dev-1.0.3-codeparser
new 5af2208 Merge pull request #1209 from peacewong/dev-1.0.3-codeparser
The 1658 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:
.../manager/common/entity/node/AMEMNode.java | 32 +++++++---
.../manager/common/entity/node/AMEngineNode.java | 15 +++++
.../linkis/manager/common/entity/node/AMNode.java | 5 --
.../manager/common/entity/node/InfoRMNode.java | 26 ++++++++
.../linkis/manager/common/entity/node/Node.java | 11 ++++
.../entity/persistence/PersistenceLabelRel.java | 21 +++----
.../entity/persistence/PersistenceNodeEntity.java | 7 ++-
.../common/entity/resource/CommonNodeResource.java | 11 ++++
.../common/entity/resource/NodeResource.java | 4 ++
.../common/entity/resource/UserResource.java} | 73 ++++++++++------------
...pEMRequest.java => EMResourceClearRequest.java} | 12 ++--
.../manager/common/entity/resource/Resource.scala | 11 ++--
...quest.scala => EMResourceRegisterRequest.scala} | 13 ++--
.../common/protocol/em/RegisterEMResponse.scala | 2 +-
.../protocol/engine/EngineConnStatusCallback.scala | 18 ++++--
.../manager/common/utils/ResourceUtils.scala | 41 +++++++++++-
.../errorcode/RMErrorConstants.scala | 22 -------
17 files changed, 214 insertions(+), 110 deletions(-)
copy
linkis-commons/linkis-message-scheduler/src/main/java/org/apache/linkis/message/tx/TransactionManager.java
=>
linkis-computation-governance/linkis-manager/linkis-manager-commons/linkis-manager-common/src/main/java/org/apache/linkis/manager/common/entity/persistence/PersistenceLabelRel.java
(72%)
copy
linkis-computation-governance/linkis-manager/{linkis-resource-manager/src/main/java/org/apache/linkis/resourcemanager/restful/vo/EngineInstanceVo.java
=>
linkis-manager-commons/linkis-manager-common/src/main/java/org/apache/linkis/manager/common/entity/resource/UserResource.java}
(53%)
copy
linkis-computation-governance/linkis-manager/linkis-manager-commons/linkis-manager-common/src/main/java/org/apache/linkis/manager/common/protocol/em/{StopEMRequest.java
=> EMResourceClearRequest.java} (91%)
copy
linkis-computation-governance/linkis-manager/linkis-manager-commons/linkis-manager-common/src/main/scala/org/apache/linkis/manager/common/protocol/em/{RegisterEMRequest.scala
=> EMResourceRegisterRequest.scala} (95%)
delete mode 100644
linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/scala/org/apache/linkis/resourcemanager/errorcode/RMErrorConstants.scala
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
