This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a change to branch dev-1.0.3
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git.
from 83ad189 Merge pull request #1205 from casionone/bugfix_1
new c3f3d07 Optimize entrance log
new c8ae6cc Optimize entrance logic
new a235535 Optimize jobRequest conversion
new b9191e0 Add taskID to distinguish tasks
new 3db0a60 entrance:solve the execution and kill problems
new 924d624 optimize message scheduler
new 95d4d90 add abandonedConfig for mysql datasource
new 622562d fixed a bug that variable substituion defined in code is in
effective
new 9dca6b4 entrance:compatible with local logs
new b8dfd62 entrance:optimize for logBus
new 679b2e9 Merge branch 'dev-1.0.3' into bugfix_2
new 3ec7213 bugfix:remove beforeStateChanged and add
VarSubstitutionInterceptor
new 644eb50 Merge pull request #1206 from casionone/bugfix_2
The 1638 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:
.../linkis/message/builder/DefaultMessageJob.java | 3 +-
.../linkis/message/conf/MessageSchedulerConf.java | 5 +-
.../message/scheduler/AbstractMessageExecutor.java | 59 ++-
.../message/scheduler/DefaultMessageScheduler.java | 9 +-
.../scheduler/MessageExecutorExecutionManager.java | 11 +-
.../apache/linkis/mybatis/DataSourceConfig.java | 4 +
.../linkis/mybatis/conf/MybatisConfiguration.java | 3 +
.../linkis/scheduler/queue/SchedulerEvent.scala | 2 +-
.../async/AsyncConcurrentComputationExecutor.scala | 17 +-
.../executor/execute/ComputationExecutor.scala | 4 +-
.../service/TaskExecutionServiceImpl.scala | 2 +-
.../entrance/conf/EntranceSpringConfiguration.java | 8 -
.../entrance/context/DefaultEntranceContext.java | 18 +-
.../linkis/entrance/job/EntranceExecutionJob.java | 2 +-
.../entrance/parser/AbstractEntranceParser.java | 33 +-
.../apache/linkis/entrance/parser/ParserUtils.java | 20 +-
.../persistence/QueryPersistenceManager.java | 40 +-
.../apache/linkis/entrance/EntranceContext.scala | 2 -
.../apache/linkis/entrance/EntranceParser.scala | 9 +-
.../apache/linkis/entrance/EntranceServer.scala | 10 +-
.../linkis/entrance/EntranceWebSocketService.scala | 6 -
.../entrance/execute/DefaultEntranceExecutor.scala | 181 +++-----
.../linkis/entrance/execute/EntranceExecutor.scala | 138 ++++---
.../entrance/execute/EntranceExecutorManager.scala | 54 +--
.../linkis/entrance/execute/EntranceJob.scala | 45 +-
.../interceptor/impl/CustomVariableUtils.scala | 457 +++++++++++++++------
...eptor.scala => ParserVarLabelInterceptor.scala} | 44 +-
.../linkis/entrance/log/CacheLogManager.scala | 4 +-
.../linkis/entrance/log/CacheLogReader.scala | 27 +-
.../linkis/entrance/log/ErrorCodeListener.scala | 2 +-
.../apache/linkis/entrance/log/LogManager.scala | 21 +-
.../org/apache/linkis/entrance/log/LogReader.scala | 65 +--
.../persistence/EntranceResultSetEngine.scala | 55 +--
.../entrance/persistence/ResultSetEngine.scala | 4 +-
.../entrance/persistence/ResultSetListener.scala | 6 +-
.../linkis/entrance/utils/CommonLogPathUtils.scala | 52 +++
.../LogHelper.scala} | 23 +-
.../executor/FlinkSQLComputationExecutor.scala | 4 +-
.../hive/executor/HiveEngineConnExecutor.scala | 4 +-
.../io/executor/IoEngineConnExecutor.scala | 4 +-
.../jdbc/executer/JDBCEngineConnExecutor.scala | 4 +-
.../executor/PipelineEngineConnExecutor.scala | 4 +-
.../python/executor/PythonEngineConnExecutor.scala | 6 +-
.../shell/executor/ShellEngineConnExecutor.scala | 6 +-
.../spark/executor/SparkEngineConnExecutor.scala | 6 +-
...ComputationOrchestratorSessionFactoryImpl.scala | 4 +
46 files changed, 776 insertions(+), 711 deletions(-)
copy
linkis-orchestrator/plugin/linkis-orchestrator-ecm-plugin/src/main/java/org/apache/linkis/orchestrator/ecm/entity/Policy.java
=>
linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/async/AsyncConcurrentComputationExecutor.scala
(76%)
copy
linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/{ScalaCodeInterceptor.scala
=> ParserVarLabelInterceptor.scala} (53%)
create mode 100644
linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/utils/CommonLogPathUtils.scala
copy
linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/{interceptor/exception/LabelCheckException.scala
=> utils/LogHelper.scala} (70%)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
