You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by al...@apache.org on 2022/02/15 13:53:38 UTC
[incubator-linkis] branch dev-udf updated (b885b50 -> 5626258)
This is an automated email from the ASF dual-hosted git repository.
alexkun pushed a change to branch dev-udf
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git.
from b885b50 Merge pull request #1468 from WeDataSphere/dev-1.1.2
new 45bd8b6 orchestrator Replace message-scheduler with rpc module
new bb962ac add resource record operation
new 61bd937 remove CheckRuler that is not used by orchestrator #1463
new abb2b3e Optimized wait time of RetryExecTask can be set #1464
new 3c6fa9e Optimize code logic
new 5f25ccc Optimize code logic
new ca834f5 Revert "remove CheckRuler that is not used by orchestrator #1463"
new 2962ef2 remove CheckRuler that is not used by orchestrator #1463
new 2c753b4 add CompatibleInterceptor #1465
new de16b80 add method getRunningSubJobIndex
new 551323b Optimize code
new bde4fef Entrance adds progress details interface, supports return task resource information #1466
new 531762c Adjust SimpleDateFormat to ThreadLocal variable close #1379
new 5c968ed Optimize code logic
new 5a8b564 Fix #1467
new 304e3f0 Optimize module
new b2d9a12 remove module linkis-message-scheduler close #1419
new 5626258 Merge pull request #1473 from WeDataSphere/dev-1.1.2
The 1998 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:
.gitignore | 1 -
.../assembly-combined/conf/log4j2.xml | 6 -
.../public-module-combined/pom.xml | 19 +-
linkis-commons/linkis-message-scheduler/pom.xml | 87 ----
.../apache/linkis/message/annotation/Chain.java | 30 --
.../apache/linkis/message/annotation/Implicit.java | 27 -
.../apache/linkis/message/annotation/Method.java | 29 --
.../linkis/message/annotation/NotImplicit.java | 27 -
.../apache/linkis/message/annotation/Order.java | 29 --
.../apache/linkis/message/annotation/Receiver.java | 27 -
.../linkis/message/builder/DefaultMessageJob.java | 182 -------
.../message/builder/DefaultMessageJobBuilder.java | 75 ---
.../builder/DefaultServiceMethodContext.java | 166 -------
.../org/apache/linkis/message/builder/Future.java | 34 --
.../apache/linkis/message/builder/MessageJob.java | 44 --
.../linkis/message/builder/MessageJobBuilder.java | 40 --
.../linkis/message/builder/MessageJobListener.java | 46 --
.../message/builder/MessageJobTimeoutPolicy.java | 26 -
.../message/builder/ServiceMethodContext.java | 64 ---
.../linkis/message/conf/MessageSchedulerConf.java | 54 --
.../context/AbstractMessageSchedulerContext.java | 112 -----
.../context/DefaultMessageSchedulerContext.java | 41 --
.../linkis/message/context/MSContextInstance.java | 49 --
.../message/context/MessageSchedulerContext.java | 31 --
.../context/SpringMessageSchedulerContext.java | 41 --
.../message/exception/MessageErrorException.java | 32 --
.../message/exception/MessageWarnException.java | 32 --
.../message/parser/DefaultImplicitParser.java | 65 ---
.../message/parser/DefaultServiceParser.java | 102 ----
.../linkis/message/parser/ImplicitMethod.java | 63 ---
.../linkis/message/parser/ImplicitParser.java | 26 -
.../linkis/message/parser/ServiceMethod.java | 123 -----
.../linkis/message/parser/ServiceParser.java | 26 -
.../publisher/AbstractMessagePublisher.java | 194 --------
.../message/publisher/DefaultMessagePublisher.java | 31 --
.../linkis/message/publisher/MessagePublisher.java | 29 --
.../message/registry/AbstractImplicitRegistry.java | 90 ----
.../message/registry/AbstractServiceRegistry.java | 89 ----
.../linkis/message/registry/ImplicitRegistry.java | 23 -
.../linkis/message/registry/ServiceRegistry.java | 23 -
.../message/registry/SpringImplicitRegistry.java | 53 --
.../message/registry/SpringServiceRegistry.java | 44 --
.../message/scheduler/AbstractMessageExecutor.java | 264 ----------
.../message/scheduler/DefaultMessageExecutor.java | 100 ----
.../message/scheduler/DefaultMessageScheduler.java | 89 ----
.../linkis/message/scheduler/MessageExecutor.java | 29 --
.../scheduler/MessageExecutorExecutionManager.java | 74 ---
.../linkis/message/scheduler/MessageScheduler.java | 25 -
.../message/scheduler/MethodExecuteWrapper.java | 74 ---
.../message/tx/SpringTransactionManager.java | 56 ---
.../linkis/message/tx/TransactionManager.java | 29 --
.../apache/linkis/message/utils/MessageUtils.java | 94 ----
.../src/main/resources/META-INF/spring.factories | 19 -
.../org/apache/linkis/rpc/MessageConverter.scala | 83 ----
.../apache/linkis/rpc/MessageErrorConstants.scala | 22 -
.../org/apache/linkis/rpc/MessageRPCConsumer.scala | 72 ---
.../linkis/rpc/MessageRPCReceiveRestful.scala | 117 -----
.../linkis/rpc/MessageRPCSpringConfiguration.scala | 47 --
.../org/apache/linkis/rpc/MessageReceiver.scala | 82 ---
.../apache/linkis/rpc/MessageReceiverChooser.scala | 33 --
.../linkis/message/DefaultRequestProtocol.java | 23 -
.../apache/linkis/message/ImplicitInterface.java | 21 -
.../linkis/message/ImplicitInterfaceImpl.java | 21 -
.../org/apache/linkis/message/ImplicitObject.java | 29 --
.../linkis/message/SchedulerMessageTest.java | 113 -----
.../org/apache/linkis/message/TestService.java | 75 ---
.../org/apache/linkis/message/TestService2.java | 28 --
linkis-commons/pom.xml | 1 -
.../linkis-entrance/pom.xml | 7 -
.../entrance/conf/EntranceSpringConfiguration.java | 2 +
.../linkis/entrance/job/EntranceExecutionJob.java | 60 +--
.../entrance/parser/AbstractEntranceParser.java | 2 -
.../persistence/QueryPersistenceEngine.java | 2 +-
.../persistence/QueryPersistenceManager.java | 9 +-
.../entrance/restful/EntranceRestfulApi.java | 145 +++++-
.../entrance/conf/EntranceConfiguration.scala | 20 +-
.../entrance/execute/DefaultEntranceExecutor.scala | 71 ++-
.../linkis/entrance/execute/EntranceExecutor.scala | 48 +-
.../linkis/entrance/execute/EntranceJob.scala | 38 +-
...terceptor.scala => CompatibleInterceptor.scala} | 32 +-
.../interceptor/impl/CustomVariableUtils.scala | 293 +++++++----
.../linkis/entrance/interceptor/impl/Explain.scala | 62 +--
.../impl/ShellDangerousGrammerInterceptor.scala | 91 ++--
.../impl/StorePathEntranceInterceptor.scala | 19 +-
.../linkis/entrance/log/CacheLogManager.scala | 20 +-
.../linkis/entrance/log/CacheLogReader.scala | 21 +-
.../linkis/entrance/log/CacheLogWriter.scala | 31 +-
.../linkis/entrance/log/ErrorCodeListener.scala | 24 +-
.../linkis/entrance/log/HDFSCacheLogWriter.scala | 150 ++++++
.../apache/linkis/entrance/log/LogManager.scala | 9 +-
.../org/apache/linkis/entrance/log/LogReader.scala | 20 +-
.../org/apache/linkis/entrance/log/LogWriter.scala | 113 ++---
.../EntranceOrchestrationFactory.scala | 4 +-
.../entrance/persistence/PersistenceEngine.scala | 30 +-
.../entrance/restful/EntranceRestfulRemote.scala | 12 +-
.../linkis/entrance/utils/JobHistoryHelper.scala | 17 +-
.../utils/{LogHelper.scala => RGBUtils.scala} | 24 +-
.../flink/src/main/resources/log4j2.xml | 3 -
.../hive/src/main/resources/log4j2.xml | 3 -
.../io_file/src/main/resources/log4j2.xml | 3 -
.../jdbc/src/main/resources/log4j2.xml | 3 -
.../pipeline/src/main/resources/log4j2.xml | 3 -
.../python/src/main/resources/log4j2.xml | 4 +-
.../shell/src/main/resources/conf/log4j2.xml | 3 -
.../linkis-computation-orchestrator/pom.xml | 3 +-
...ComputationOrchestratorSessionFactoryImpl.scala | 5 -
.../ruler/CommentConverterCheckRuler.scala | 94 ----
.../converter/ruler/CustomVariableUtils.scala | 553 ---------------------
.../catalyst/converter/ruler/Explain.scala | 328 ------------
.../ruler/PythonCodeConverterCheckRuler.scala | 50 --
.../ruler/SQLCodeCheckConverterCheckRuler.scala | 43 --
.../ruler/SQLLimitConverterCheckRuler.scala | 41 --
.../ruler/ScalaCodeConverterCheckRuler.scala | 47 --
.../ShellDangerousGrammarConverterCheckRuler.scala | 103 ----
.../ruler/SparkCodeCheckConverterCheckRuler.scala | 45 --
.../ruler/VarSubstitutionConverterCheckRuler.scala | 54 --
.../computation/execute/CodeExecTaskExecutor.scala | 2 +-
.../execute/CodeExecTaskExecutorManager.scala | 48 +-
.../DefaultCodeExecTaskExecutorManager.scala | 88 ++--
.../operation/resource/ResourceReportEvent.scala | 8 +-
.../ResourceReportOperation.scala} | 56 +--
.../ResourceReportProcessor.scala} | 35 +-
.../physical/CodeLogicalUnitExecTask.scala | 18 +-
.../service/ComputationTaskExecutionReceiver.scala | 48 +-
.../linkis-orchestrator-core/pom.xml | 6 +
...Listener.scala => ResourceReportListener.scala} | 10 +-
.../orchestrator/listener/task/TaskInfoEvent.scala | 6 +
.../orchestrator/plans/logical/CommandTask.scala | 8 +-
.../plans/physical/PhysicalContext.scala | 4 +-
.../plans/physical/PhysicalContextImpl.scala | 38 +-
.../plans/physical/RetryExecTask.scala | 51 +-
.../orchestrator/reheater/AbstractReheater.scala | 5 +-
.../plugin/linkis-orchestrator-ecm-plugin/pom.xml | 3 +-
.../linkis/orchestrator/ecm/entity/Mark.scala | 9 -
.../ecm/service/EngineAsyncResponseService.scala | 6 +-
.../ecm/service/EngineConnExecutor.scala | 17 +-
.../ecm/service/TaskExecutionReceiver.scala | 17 +-
.../impl/ComputationEngineConnExecutor.scala | 1 +
.../impl/DefaultEngineAsyncResponseService.scala | 9 +-
.../impl/DefaultTaskExecutionReceiver.scala | 47 --
.../linkis-gateway-core/pom.xml | 2 +-
141 files changed, 1174 insertions(+), 6084 deletions(-)
delete mode 100644 linkis-commons/linkis-message-scheduler/pom.xml
delete mode 100644 linkis-commons/linkis-message-scheduler/src/main/java/org/apache/linkis/message/annotation/Chain.java
delete mode 100644 linkis-commons/linkis-message-scheduler/src/main/java/org/apache/linkis/message/annotation/Implicit.java
delete mode 100644 linkis-commons/linkis-message-scheduler/src/main/java/org/apache/linkis/message/annotation/Method.java
delete mode 100644 linkis-commons/linkis-message-scheduler/src/main/java/org/apache/linkis/message/annotation/NotImplicit.java
delete mode 100644 linkis-commons/linkis-message-scheduler/src/main/java/org/apache/linkis/message/annotation/Order.java
delete mode 100644 linkis-commons/linkis-message-scheduler/src/main/java/org/apache/linkis/message/annotation/Receiver.java
delete mode 100644 linkis-commons/linkis-message-scheduler/src/main/java/org/apache/linkis/message/builder/DefaultMessageJob.java
delete mode 100644 linkis-commons/linkis-message-scheduler/src/main/java/org/apache/linkis/message/builder/DefaultMessageJobBuilder.java
delete mode 100644 linkis-commons/linkis-message-scheduler/src/main/java/org/apache/linkis/message/builder/DefaultServiceMethodContext.java
delete mode 100644 linkis-commons/linkis-message-scheduler/src/main/java/org/apache/linkis/message/builder/Future.java
delete mode 100644 linkis-commons/linkis-message-scheduler/src/main/java/org/apache/linkis/message/builder/MessageJob.java
delete mode 100644 linkis-commons/linkis-message-scheduler/src/main/java/org/apache/linkis/message/builder/MessageJobBuilder.java
delete mode 100644 linkis-commons/linkis-message-scheduler/src/main/java/org/apache/linkis/message/builder/MessageJobListener.java
delete mode 100644 linkis-commons/linkis-message-scheduler/src/main/java/org/apache/linkis/message/builder/MessageJobTimeoutPolicy.java
delete mode 100644 linkis-commons/linkis-message-scheduler/src/main/java/org/apache/linkis/message/builder/ServiceMethodContext.java
delete mode 100644 linkis-commons/linkis-message-scheduler/src/main/java/org/apache/linkis/message/conf/MessageSchedulerConf.java
delete mode 100644 linkis-commons/linkis-message-scheduler/src/main/java/org/apache/linkis/message/context/AbstractMessageSchedulerContext.java
delete mode 100644 linkis-commons/linkis-message-scheduler/src/main/java/org/apache/linkis/message/context/DefaultMessageSchedulerContext.java
delete mode 100644 linkis-commons/linkis-message-scheduler/src/main/java/org/apache/linkis/message/context/MSContextInstance.java
delete mode 100644 linkis-commons/linkis-message-scheduler/src/main/java/org/apache/linkis/message/context/MessageSchedulerContext.java
delete mode 100644 linkis-commons/linkis-message-scheduler/src/main/java/org/apache/linkis/message/context/SpringMessageSchedulerContext.java
delete mode 100644 linkis-commons/linkis-message-scheduler/src/main/java/org/apache/linkis/message/exception/MessageErrorException.java
delete mode 100644 linkis-commons/linkis-message-scheduler/src/main/java/org/apache/linkis/message/exception/MessageWarnException.java
delete mode 100644 linkis-commons/linkis-message-scheduler/src/main/java/org/apache/linkis/message/parser/DefaultImplicitParser.java
delete mode 100644 linkis-commons/linkis-message-scheduler/src/main/java/org/apache/linkis/message/parser/DefaultServiceParser.java
delete mode 100644 linkis-commons/linkis-message-scheduler/src/main/java/org/apache/linkis/message/parser/ImplicitMethod.java
delete mode 100644 linkis-commons/linkis-message-scheduler/src/main/java/org/apache/linkis/message/parser/ImplicitParser.java
delete mode 100644 linkis-commons/linkis-message-scheduler/src/main/java/org/apache/linkis/message/parser/ServiceMethod.java
delete mode 100644 linkis-commons/linkis-message-scheduler/src/main/java/org/apache/linkis/message/parser/ServiceParser.java
delete mode 100644 linkis-commons/linkis-message-scheduler/src/main/java/org/apache/linkis/message/publisher/AbstractMessagePublisher.java
delete mode 100644 linkis-commons/linkis-message-scheduler/src/main/java/org/apache/linkis/message/publisher/DefaultMessagePublisher.java
delete mode 100644 linkis-commons/linkis-message-scheduler/src/main/java/org/apache/linkis/message/publisher/MessagePublisher.java
delete mode 100644 linkis-commons/linkis-message-scheduler/src/main/java/org/apache/linkis/message/registry/AbstractImplicitRegistry.java
delete mode 100644 linkis-commons/linkis-message-scheduler/src/main/java/org/apache/linkis/message/registry/AbstractServiceRegistry.java
delete mode 100644 linkis-commons/linkis-message-scheduler/src/main/java/org/apache/linkis/message/registry/ImplicitRegistry.java
delete mode 100644 linkis-commons/linkis-message-scheduler/src/main/java/org/apache/linkis/message/registry/ServiceRegistry.java
delete mode 100644 linkis-commons/linkis-message-scheduler/src/main/java/org/apache/linkis/message/registry/SpringImplicitRegistry.java
delete mode 100644 linkis-commons/linkis-message-scheduler/src/main/java/org/apache/linkis/message/registry/SpringServiceRegistry.java
delete mode 100644 linkis-commons/linkis-message-scheduler/src/main/java/org/apache/linkis/message/scheduler/AbstractMessageExecutor.java
delete mode 100644 linkis-commons/linkis-message-scheduler/src/main/java/org/apache/linkis/message/scheduler/DefaultMessageExecutor.java
delete mode 100644 linkis-commons/linkis-message-scheduler/src/main/java/org/apache/linkis/message/scheduler/DefaultMessageScheduler.java
delete mode 100644 linkis-commons/linkis-message-scheduler/src/main/java/org/apache/linkis/message/scheduler/MessageExecutor.java
delete mode 100644 linkis-commons/linkis-message-scheduler/src/main/java/org/apache/linkis/message/scheduler/MessageExecutorExecutionManager.java
delete mode 100644 linkis-commons/linkis-message-scheduler/src/main/java/org/apache/linkis/message/scheduler/MessageScheduler.java
delete mode 100644 linkis-commons/linkis-message-scheduler/src/main/java/org/apache/linkis/message/scheduler/MethodExecuteWrapper.java
delete mode 100644 linkis-commons/linkis-message-scheduler/src/main/java/org/apache/linkis/message/tx/SpringTransactionManager.java
delete mode 100644 linkis-commons/linkis-message-scheduler/src/main/java/org/apache/linkis/message/tx/TransactionManager.java
delete mode 100644 linkis-commons/linkis-message-scheduler/src/main/java/org/apache/linkis/message/utils/MessageUtils.java
delete mode 100644 linkis-commons/linkis-message-scheduler/src/main/resources/META-INF/spring.factories
delete mode 100644 linkis-commons/linkis-message-scheduler/src/main/scala/org/apache/linkis/rpc/MessageConverter.scala
delete mode 100644 linkis-commons/linkis-message-scheduler/src/main/scala/org/apache/linkis/rpc/MessageErrorConstants.scala
delete mode 100644 linkis-commons/linkis-message-scheduler/src/main/scala/org/apache/linkis/rpc/MessageRPCConsumer.scala
delete mode 100644 linkis-commons/linkis-message-scheduler/src/main/scala/org/apache/linkis/rpc/MessageRPCReceiveRestful.scala
delete mode 100644 linkis-commons/linkis-message-scheduler/src/main/scala/org/apache/linkis/rpc/MessageRPCSpringConfiguration.scala
delete mode 100644 linkis-commons/linkis-message-scheduler/src/main/scala/org/apache/linkis/rpc/MessageReceiver.scala
delete mode 100644 linkis-commons/linkis-message-scheduler/src/main/scala/org/apache/linkis/rpc/MessageReceiverChooser.scala
delete mode 100644 linkis-commons/linkis-message-scheduler/src/test/java/org/apache/linkis/message/DefaultRequestProtocol.java
delete mode 100644 linkis-commons/linkis-message-scheduler/src/test/java/org/apache/linkis/message/ImplicitInterface.java
delete mode 100644 linkis-commons/linkis-message-scheduler/src/test/java/org/apache/linkis/message/ImplicitInterfaceImpl.java
delete mode 100644 linkis-commons/linkis-message-scheduler/src/test/java/org/apache/linkis/message/ImplicitObject.java
delete mode 100644 linkis-commons/linkis-message-scheduler/src/test/java/org/apache/linkis/message/SchedulerMessageTest.java
delete mode 100644 linkis-commons/linkis-message-scheduler/src/test/java/org/apache/linkis/message/TestService.java
delete mode 100644 linkis-commons/linkis-message-scheduler/src/test/java/org/apache/linkis/message/TestService2.java
copy linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/{CSEntranceInterceptor.scala => CompatibleInterceptor.scala} (61%)
create mode 100644 linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/log/HDFSCacheLogWriter.scala
copy linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/utils/{LogHelper.scala => RGBUtils.scala} (71%)
delete mode 100644 linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/catalyst/converter/ruler/CommentConverterCheckRuler.scala
delete mode 100644 linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/catalyst/converter/ruler/CustomVariableUtils.scala
delete mode 100644 linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/catalyst/converter/ruler/Explain.scala
delete mode 100644 linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/catalyst/converter/ruler/PythonCodeConverterCheckRuler.scala
delete mode 100644 linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/catalyst/converter/ruler/SQLCodeCheckConverterCheckRuler.scala
delete mode 100644 linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/catalyst/converter/ruler/SQLLimitConverterCheckRuler.scala
delete mode 100644 linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/catalyst/converter/ruler/ScalaCodeConverterCheckRuler.scala
delete mode 100644 linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/catalyst/converter/ruler/ShellDangerousGrammarConverterCheckRuler.scala
delete mode 100644 linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/catalyst/converter/ruler/SparkCodeCheckConverterCheckRuler.scala
delete mode 100644 linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/catalyst/converter/ruler/VarSubstitutionConverterCheckRuler.scala
copy linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/executor-core/src/main/scala/org/apache/linkis/engineconn/executor/entity/ResourceFetchExecutor.scala => linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/operation/resource/ResourceReportEvent.scala (79%)
copy linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/operation/{log/LogOperation.scala => resource/ResourceReportOperation.scala} (60%)
copy linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/operation/{log/LogProcessor.scala => resource/ResourceReportProcessor.scala} (56%)
copy linkis-orchestrator/linkis-orchestrator-core/src/main/scala/org/apache/linkis/orchestrator/listener/task/{TaskLogListener.scala => ResourceReportListener.scala} (86%)
delete mode 100644 linkis-orchestrator/plugin/linkis-orchestrator-ecm-plugin/src/main/scala/org/apache/linkis/orchestrator/ecm/service/impl/DefaultTaskExecutionReceiver.scala
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org