This is an automated email from the ASF dual-hosted git repository. peacewong pushed a commit to branch dev-1.2.1 in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit 7e0aad0082294af428c1eea6557d52a7d59094e8 Merge: 70fc6ccff 6e07927c8 Author: peacewong <[email protected]> AuthorDate: Thu Jul 28 22:23:18 2022 +0800 Merge pull request #2541 from apache/dev-1.2.0 Merge 1.2.1 to branch dev-1.2.0 .../org/apache/linkis/common/log/LogUtils.scala | 17 ++++++------ .../org/apache/linkis/common/utils/JsonUtils.scala | 2 -- .../scala/org/apache/linkis/server/Message.scala | 27 +++++++++---------- .../org/apache/linkis/rpc/BaseRPCSender.scala | 14 +++++----- .../org/apache/linkis/rpc/RPCReceiveRestful.scala | 21 ++++++++------- .../org/apache/linkis/rpc/RPCSpringBeanCache.scala | 13 +++++---- .../org/apache/linkis/rpc/ReceiverChooser.scala | 4 +-- .../SpringCloudFeignConfigurationCache.scala | 4 +-- .../linkis/rpc/sender/SpringMVCRPCSender.scala | 10 +++---- .../org/apache/linkis/scheduler/queue/Job.scala | 31 +++++++++++----------- .../async/AsyncConcurrentComputationExecutor.scala | 5 +++- .../service/DefaultExecutorHeartbeatService.scala | 2 +- .../persistence/QueryPersistenceManager.java | 11 +------- .../linkis/entrance/execute/EntranceExecutor.scala | 4 ++- .../apache/linkis/manager/am/utils/AMUtils.scala | 24 ++++++++--------- .../rm/external/yarn/YarnResourceRequester.scala | 6 +++-- .../executor/OpenLooKengEngineConnExecutor.java | 27 ++++++++++++++++--- .../execution/impl/AbstractExecutionFactory.scala | 3 +-- .../execution/impl/BaseTaskScheduler.scala | 16 ++++------- .../bml/service/impl/ResourceServiceImpl.java | 7 ++--- .../bml/service/impl/VersionServiceImpl.java | 7 +++-- .../metadata/hive/dto/MetadataQueryParam.java | 6 ++--- .../label/client/InstanceLabelClient.scala | 2 +- .../service/impl/JobHistoryQueryServiceImpl.scala | 11 ++++---- 24 files changed, 141 insertions(+), 133 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
