You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by pe...@apache.org on 2022/02/15 12:00:57 UTC
[incubator-linkis] branch dev-udf updated (2267dfc -> b885b50)
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a change to branch dev-udf
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git.
from 2267dfc Merge pull request #1462 from WeDataSphere/dev-1.1.2
new 020afe3 optimize shell engineplugin
new a322bc4 optimize spark engineplugin
new 9cdde72 optimize engineconn-plugin-framework
new f90abbc Synchronize DDL and DML statements
new e076853 remove Sensitive domain name
new 2b0b4c3 optimize log4j2.xml of engineplugin
new 6333a20 ddl removes redundant statements
new 1d60cfc Increase the operation permission check of the configuration module, and optimize some diamante
new dc5187d run spotless plugin
new b885b50 Merge pull request #1468 from WeDataSphere/dev-1.1.2
The 1980 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:
db/linkis_ddl.sql | 122 ++++++---
db/linkis_dml.sql | 282 ++++++++++++++-------
db/module/linkis-bml.sql | 5 +-
.../module/linkis-mg.sql | 17 ++
db/module/linkis_errorcode.sql | 108 --------
db/module/linkis_udf.sql | 71 +++---
.../flink/src/main/resources/log4j2.xml | 25 +-
.../hive/src/main/resources/log4j2.xml | 2 +
.../jdbc/src/main/resources/log4j2.xml | 2 +
.../pipeline/src/main/resources/log4j2.xml | 39 ++-
.../python/src/main/resources/log4j2.xml | 7 +-
.../python/src/main/resources/python/python.py | 130 +++++-----
.../engineconn-plugins/shell/pom.xml | 8 +-
.../shell/src/main/assembly/distribution.xml | 12 +-
.../shell/src/main/resources/bin/kill-yarn-jobs.sh | 253 ++++++++++++++++++
.../{ => conf}/linkis-engineconn.properties | 1 +
.../shell/src/main/resources/{ => conf}/log4j2.xml | 27 +-
.../engineplugin/shell/ShellEngineConnPlugin.scala | 32 ++-
.../shell/common/ShellEnginePluginConst.scala | 9 +-
.../shell/executor/ErrorStreamReaderThread.scala | 72 ++++++
.../shell/executor/ShellEngineConnExecutor.scala | 166 +++++++++++-
.../shell/executor/YarnAppIdExtractor.scala | 129 ++++++++++
.../main/resources/linkis-engineconn.properties | 9 +-
.../spark/src/main/resources/log4j2.xml | 30 +--
.../spark/src/main/resources/python/mix_pyspark.py | 6 +-
.../engineplugin/spark/SparkEngineConnPlugin.scala | 41 ++-
.../spark/args/SparkPythonArgsAppender.scala | 33 +--
.../args/SparkPythonArgsPreExecutionHook.scala | 86 +++++++
.../spark/common/SparkEnginePluginConst.scala | 10 +-
.../spark/config/SparkConfiguration.scala | 4 +
...onHook.scala => CSSparkPostExecutionHook.scala} | 44 ++--
.../spark/cs/CSSparkPreExecutionHook.scala | 4 +-
.../engineplugin/spark/cs/CSTableParser.scala | 31 ++-
.../spark/executor/SparkEngineConnExecutor.scala | 19 +-
.../spark/executor/SparkPythonExecutor.scala | 44 ++--
.../spark/executor/SparkScalaExecutor.scala | 28 +-
.../spark/executor/SparkSqlExecutor.scala | 13 +-
.../spark/extension/SparkSqlExtension.scala | 53 ++--
.../spark/factory/SparkEngineConnFactory.scala | 2 +-
.../engineplugin/spark/imexport/ExportData.scala | 13 +-
...SparkSubmitProcessEngineConnLaunchBuilder.scala | 13 +-
.../spark/lineage/LineageSparkSqlExtension.scala | 41 +++
.../spark/lineage/SparkLineageUtils.scala | 60 +++++
.../execution/datasources/csv/DolphinToSpark.scala | 14 +-
.../exception/EngineConnPluginLoadException.scala | 3 +-
.../EngineConnPluginLoadResourceException.scala | 3 +-
.../EngineConnPluginNotFoundException.scala | 3 +-
.../resource/GenericEngineResourceFactory.scala | 7 +-
.../common/resource/UserNodeResource.scala | 1 -
.../linkis-engineconn-plugin-server/pom.xml | 10 +-
.../src/main/assembly/distribution.xml | 1 +
.../conf/EngineConnPluginConfiguration.scala | 3 +
.../service/DefaultEngineConnLaunchService.scala | 2 +-
.../DefaultEngineConnResourceFactoryService.scala | 2 +-
.../service/DefaultEngineConnResourceService.scala | 22 +-
.../linkis/configuration/dao/impl/ConfigMapper.xml | 5 +-
.../restful/api/ConfigurationRestfulApi.java | 30 ++-
.../linkis/configuration/conf/Configuration.scala | 8 +
.../configuration/service/CategoryService.scala | 22 +-
.../service/ConfigurationService.scala | 62 +++--
.../configuration/util/LabelParameterParser.scala | 4 +-
.../synchronizer/LinkisErrorCodeSynchronizer.java | 8 +-
.../java/org/apache/linkis/udf/api/UDFApi.java | 1 -
.../linkis/gateway/security/GatewaySSOUtils.scala | 2 -
64 files changed, 1678 insertions(+), 638 deletions(-)
copy linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-authentication/src/test/resources/conf/run_first_for_test.sql => db/module/linkis-mg.sql (69%)
delete mode 100644 db/module/linkis_errorcode.sql
create mode 100644 linkis-engineconn-plugins/engineconn-plugins/shell/src/main/resources/bin/kill-yarn-jobs.sh
rename linkis-engineconn-plugins/engineconn-plugins/shell/src/main/resources/{ => conf}/linkis-engineconn.properties (95%)
mode change 100755 => 100644
rename linkis-engineconn-plugins/engineconn-plugins/shell/src/main/resources/{ => conf}/log4j2.xml (78%)
mode change 100755 => 100644
copy linkis-commons/linkis-httpclient/src/main/scala/org/apache/linkis/httpclient/config/HttpClientConstant.scala => linkis-engineconn-plugins/engineconn-plugins/shell/src/main/scala/org/apache/linkis/manager/engineplugin/shell/common/ShellEnginePluginConst.scala (76%)
create mode 100644 linkis-engineconn-plugins/engineconn-plugins/shell/src/main/scala/org/apache/linkis/manager/engineplugin/shell/executor/ErrorStreamReaderThread.scala
create mode 100644 linkis-engineconn-plugins/engineconn-plugins/shell/src/main/scala/org/apache/linkis/manager/engineplugin/shell/executor/YarnAppIdExtractor.scala
copy linkis-orchestrator/linkis-orchestrator-core/src/main/scala/org/apache/linkis/orchestrator/plans/logical/AbstractTask.scala => linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/args/SparkPythonArgsAppender.scala (61%)
create mode 100644 linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/args/SparkPythonArgsPreExecutionHook.scala
copy linkis-commons/linkis-message-scheduler/src/main/java/org/apache/linkis/message/builder/MessageJobTimeoutPolicy.java => linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/common/SparkEnginePluginConst.scala (85%)
copy linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/cs/{CSSparkPreExecutionHook.scala => CSSparkPostExecutionHook.scala} (58%)
create mode 100644 linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/lineage/LineageSparkSqlExtension.scala
create mode 100644 linkis-engineconn-plugins/engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/lineage/SparkLineageUtils.scala
copy linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/{ => loader}/exception/EngineConnPluginLoadException.scala (93%)
copy linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/{ => loader}/exception/EngineConnPluginLoadResourceException.scala (94%)
copy linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/{ => loader}/exception/EngineConnPluginNotFoundException.scala (93%)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org