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/18 12:33:15 UTC
[incubator-linkis] 02/02: Merge remote-tracking branch 'origin/master' into dev-udf
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-udf
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit 41a979be3e0512ba7d644e0af217c91ed62697a5
Merge: 2dd2659 16e4b59
Author: peacewong <wp...@gmail.com>
AuthorDate: Fri Feb 18 20:32:42 2022 +0800
Merge remote-tracking branch 'origin/master' into dev-udf
# Conflicts:
# linkis-computation-governance/linkis-engineconn/linkis-engineconn-launch/pom.xml
# linkis-computation-governance/linkis-manager/linkis-manager-commons/linkis-resource-manager-common/pom.xml
# linkis-public-enhancements/linkis-publicservice/linkis-ps-common-lock/pom.xml
# linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-authentication/pom.xml
# linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-authentication/src/test/java/org/apache/linkis/datasource/client/TestDataSourceClient.scala
LICENSE-binary-ui | 4 +-
README.md | 13 +
README_CN.md | 15 +-
.../assembly-combined/pom.xml | 2 +-
.../public-module-combined/pom.xml | 2 +-
assembly-combined-package/bin/install.sh | 2 +-
.../deploy-config/linkis-env.sh | 2 +-
assembly-combined-package/pom.xml | 2 +-
licenses-binary-ui/LICENSE-form-create.txt | 21 +
licenses-binary-ui/LICENSE-object-to-formdata.txt | 21 +
linkis-commons/linkis-common/pom.xml | 2 +-
linkis-commons/linkis-hadoop-common/pom.xml | 2 +-
linkis-commons/linkis-httpclient/pom.xml | 2 +-
linkis-commons/linkis-module/pom.xml | 17 +-
.../apache/linkis/server/conf/Knife4jConfig.scala | 91 ---
linkis-commons/linkis-mybatis/pom.xml | 2 +-
linkis-commons/linkis-protocol/pom.xml | 2 +-
linkis-commons/linkis-rpc/pom.xml | 2 +-
linkis-commons/linkis-scheduler/pom.xml | 2 +-
linkis-commons/linkis-storage/pom.xml | 2 +-
linkis-commons/pom.xml | 2 +-
.../linkis-cli/linkis-cli-application/pom.xml | 2 +-
.../linkis-cli/linkis-cli-common/pom.xml | 2 +-
.../linkis-cli/linkis-cli-core/pom.xml | 2 +-
.../linkis-client/linkis-cli/pom.xml | 2 +-
.../linkis-computation-client/pom.xml | 2 +-
.../linkis-computation-governance-common/pom.xml | 2 +-
.../governance/common/paser/CodeParser.scala | 40 +-
.../linkis-engineconn-linux-launch/pom.xml | 2 +-
.../linkis-engineconn-manager-core/pom.xml | 2 +-
.../linkis-engineconn-manager-server/pom.xml | 2 +-
.../linkis-engineconn-manager/pom.xml | 2 +-
.../linkis-once-engineconn/pom.xml | 2 +-
.../linkis-computation-engineconn/pom.xml | 2 +-
.../linkis-engineconn-common/pom.xml | 2 +-
.../linkis-engineconn-core/pom.xml | 2 +-
.../accessible-executor/pom.xml | 2 +-
.../conf/AccessibleExecutorConfiguration.scala | 2 +-
.../callback-service/pom.xml | 2 +-
.../executor-core/pom.xml | 2 +-
.../resource-executor/pom.xml | 2 +-
.../linkis-engineconn/pom.xml | 2 +-
.../linkis-entrance/pom.xml | 2 +-
.../entrance/job/EntranceExecuteRequest.java | 12 +-
.../linkis/entrance/job/EntranceExecutionJob.java | 2 +-
.../entrance/parser/AbstractEntranceParser.java | 12 +-
.../entrance/execute/DefaultEntranceExecutor.scala | 4 +-
.../linkis-manager/label-common/pom.xml | 2 +-
.../linkis-manager/label-manager/pom.xml | 2 +-
.../linkis-application-manager/pom.xml | 2 +-
.../linkis-manager-common/pom.xml | 2 +-
.../linkis-manager-service-common/pom.xml | 2 +-
.../linkis-manager-persistence/pom.xml | 2 +-
.../linkis-manager/linkis-resource-manager/pom.xml | 2 +-
.../linkis-manager/pom.xml | 2 +-
linkis-computation-governance/pom.xml | 2 +-
.../engineconn-plugins/flink/pom.xml | 2 +-
.../engineconn-plugins/hive/pom.xml | 2 +-
.../engineconn-plugins/io_file/pom.xml | 2 +-
.../engineconn-plugins/jdbc/pom.xml | 2 +-
.../engineconn-plugins/pipeline/pom.xml | 2 +-
.../engineconn-plugins/python/pom.xml | 2 +-
.../engineconn-plugins/shell/pom.xml | 2 +-
.../engineconn-plugins/spark/pom.xml | 2 +-
.../spark/config/SparkConfiguration.scala | 2 +-
.../linkis-engineconn-plugin-cache/pom.xml | 2 +-
.../linkis-engineconn-plugin-core/pom.xml | 2 +-
.../linkis-engineconn-plugin-loader/pom.xml | 2 +-
.../linkis-engineconn-plugin-server/pom.xml | 2 +-
linkis-engineconn-plugins/pom.xml | 2 +-
linkis-extensions/linkis-io-file-client/pom.xml | 2 +-
linkis-extensions/pom.xml | 3 +-
.../linkis-code-orchestrator/pom.xml | 2 +-
.../linkis-computation-orchestrator/pom.xml | 2 +-
.../linkis-orchestrator-core/pom.xml | 2 +-
.../plugin/linkis-orchestrator-ecm-plugin/pom.xml | 2 +-
linkis-orchestrator/pom.xml | 2 +-
.../linkis-bml/linkis-bml-client/pom.xml | 2 +-
.../linkis-bml/linkis-bml-common/pom.xml | 2 +-
.../linkis-bml/linkis-bml-engine-hook/pom.xml | 2 +-
.../linkis-bml/linkis-bml-server/pom.xml | 2 +-
linkis-public-enhancements/linkis-bml/pom.xml | 2 +-
.../linkis-context-service/linkis-cs-cache/pom.xml | 2 +-
.../linkis-cs-client/pom.xml | 2 +-
.../linkis-cs-common/pom.xml | 2 +-
.../linkis-cs-engine-support/pom.xml | 2 +-
.../linkis-cs-highavailable/pom.xml | 2 +-
.../linkis-cs-listener/pom.xml | 2 +-
.../linkis-cs-persistence/pom.xml | 2 +-
.../linkis-cs-search/pom.xml | 2 +-
.../linkis-cs-server/pom.xml | 2 +-
.../linkis-context-service/pom.xml | 2 +-
.../datasource/client/DataSourceRemoteClient.scala | 38 ++
.../datasource/client/MetaDataRemoteClient.scala | 29 +
.../client/impl/LinkisDataSourceRemoteClient.scala | 59 ++
.../client/impl/LinkisMetaDataRemoteClient.scala | 38 ++
.../client/request/CreateDataSourceAction.scala | 70 +++
.../client/request/DataSourceAction.scala | 22 +
.../request/DataSourceTestConnectAction.scala | 79 +++
.../client/request/DeleteDataSourceAction.scala | 62 +++
.../client/request/ExpireDataSourceAction.scala | 63 +++
.../request/GetAllDataSourceTypesAction.scala | 52 ++
.../GetConnectParamsByDataSourceIdAction.scala | 75 +++
.../GetConnectParamsByDataSourceNameAction.scala | 83 +++
.../request/GetDataSourceVersionsAction.scala | 62 +++
.../request/GetInfoByDataSourceIdAction.scala | 73 +++
.../request/GetKeyTypeDatasourceAction.scala | 63 +++
.../client/request/MetadataGetColumnsAction.scala | 93 ++++
.../request/MetadataGetDatabasesAction.scala | 73 +++
.../request/MetadataGetPartitionsAction.scala | 91 +++
.../request/MetadataGetTablePropsAction.scala | 92 ++++
.../client/request/MetadataGetTablesAction.scala | 81 +++
.../request/PublishDataSourceVersionAction.scala | 74 +++
.../client/request/QueryDataSourceAction.scala | 103 ++++
.../client/request/QueryDataSourceEnvAction.scala | 89 +++
.../client/request/UpdateDataSourceAction.scala | 83 +++
.../request/UpdateDataSourceParameterAction.scala | 82 +++
.../client/response/CreateDataSourceResult.scala | 28 +
.../response/DataSourceTestConnectResult.scala | 28 +
.../client/response/DeleteDataSourceResult.scala | 28 +
.../client/response/ExpireDataSourceResult.scala | 28 +
.../response/GetAllDataSourceTypesResult.scala | 40 ++
.../GetConnectParamsByDataSourceIdResult.scala | 28 +
.../GetConnectParamsByDataSourceNameResult.scala | 27 +
.../response/GetDataSourceVersionsResult.scala | 40 ++
.../response/GetInfoByDataSourceIdResult.scala | 35 ++
.../response/GetKeyTypeDatasourceResult.scala | 40 ++
.../client/response/MetadataGetColumnsResult.scala | 39 ++
.../response/MetadataGetDatabasesResult.scala | 29 +
.../response/MetadataGetPartitionsResult.scala | 29 +
.../response/MetadataGetTablePropsResult.scala | 29 +
.../client/response/MetadataGetTablesResult.scala | 29 +
.../response/PublishDataSourceVersionResult.scala | 26 +
.../client/response/QueryDataSourceEnvResult.scala | 40 ++
.../client/response/QueryDataSourceResult.scala | 40 ++
.../response/UpdateDataSourceParameterResult.scala | 28 +
.../client/response/UpdateDataSourceResult.scala | 28 +
.../linkis-datasource-manager/common/pom.xml | 2 +-
.../linkis-datasource-manager/server/pom.xml | 2 +-
.../linkis-metadata-manager/common/pom.xml | 2 +-
.../linkis-metadata-manager/server/pom.xml | 2 +-
.../service/elasticsearch/pom.xml | 2 +-
.../linkis-metadata-manager/service/hive/pom.xml | 2 +-
.../linkis-metadata-manager/service/kafka/pom.xml | 2 +-
.../linkis-metadata-manager/service/mysql/pom.xml | 2 +-
.../linkis-datasource/linkis-metadata/pom.xml | 2 +-
.../linkis-datasource/pom.xml | 2 +-
.../linkis-configuration/pom.xml | 2 +-
.../linkis-error-code-client/pom.xml | 2 +-
.../linkis-error-code-common/pom.xml | 2 +-
.../linkis-error-code-server/pom.xml | 2 +-
.../linkis-publicservice/linkis-error-code/pom.xml | 2 +-
.../linkis-instance-label-client/pom.xml | 2 +-
.../linkis-instance-label-server/pom.xml | 2 +-
.../linkis-publicservice/linkis-jobhistory/pom.xml | 2 +-
.../linkis-storage-script-dev-client/pom.xml | 2 +-
.../linkis-storage-script-dev-server/pom.xml | 2 +-
.../linkis-udf/linkis-udf-client/pom.xml | 2 +-
.../linkis-udf/linkis-udf-common/pom.xml | 2 +-
.../linkis-udf/linkis-udf-service/pom.xml | 2 +-
.../linkis-publicservice/linkis-variable/pom.xml | 2 +-
.../linkis-publicservice/pom.xml | 2 +-
linkis-public-enhancements/pom.xml | 2 +-
.../linkis-service-discovery/linkis-eureka/pom.xml | 2 +-
.../datasource/client/TestDataSourceClient.scala | 78 +++
.../linkis-gateway-core/pom.xml | 2 +-
.../linkis-gateway-httpclient-support/pom.xml | 2 +-
.../linkis-gateway-server-support/pom.xml | 2 +-
.../linkis-spring-cloud-gateway/pom.xml | 2 +-
.../linkis-service-gateway/pom.xml | 2 +-
linkis-spring-cloud-services/pom.xml | 2 +-
pom.xml | 4 +-
web/.env | 2 +-
web/package.json | 2 +
web/src/apps/linkis/i18n/common/en.json | 43 +-
web/src/apps/linkis/i18n/common/zh.json | 46 +-
.../apps/linkis/module/datasource/dataSourceApi.js | 144 +++++
.../module/datasource/datasourceForm/index.scss | 78 +++
.../module/datasource/datasourceForm/index.vue | 268 +++++++++
.../module/datasource/datasourceType/index.scss | 111 ++++
.../module/datasource/datasourceType/index.vue | 76 +++
web/src/apps/linkis/module/datasource/index.js | 21 +
web/src/apps/linkis/module/datasource/index.scss | 65 +++
web/src/apps/linkis/module/datasource/index.vue | 613 +++++++++++++++++++++
web/src/apps/linkis/router.js | 16 +-
web/src/apps/linkis/view/linkis/index.vue | 1 +
web/src/main.js | 9 +-
187 files changed, 4154 insertions(+), 270 deletions(-)
diff --cc linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/scala/org/apache/linkis/engineconn/acessible/executor/conf/AccessibleExecutorConfiguration.scala
index 4bea680,27a38f7..dff9b79
--- a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/scala/org/apache/linkis/engineconn/acessible/executor/conf/AccessibleExecutorConfiguration.scala
+++ b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/scala/org/apache/linkis/engineconn/acessible/executor/conf/AccessibleExecutorConfiguration.scala
@@@ -32,10 -32,10 +32,10 @@@ object AccessibleExecutorConfiguration
val ENGINECONN_LOG_SEND_TIME_INTERVAL = CommonVars("wds.linkis.engineconn.log.send.time.interval", 200)
- val ENGINECONN_LOG_SEND_SIZE = CommonVars[Int]("wds.linkis.engineconn.log.send.cache.size", 5)
+ val ENGINECONN_LOG_SEND_SIZE = CommonVars[Int]("wds.linkis.engineconn.log.send.cache.size", 300)
- val ENGINECONN_MAX_FREE_TIME = CommonVars("wds.linkis.engineconn.max.free.time", new TimeType("0.5h"))
+ val ENGINECONN_MAX_FREE_TIME = CommonVars("wds.linkis.engineconn.max.free.time", new TimeType("30m"))
val ENGINECONN_LOCK_CHECK_INTERVAL = CommonVars("wds.linkis.engineconn.lock.free.interval", new TimeType("3m"))
diff --cc linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-authentication/src/test/java/org/apache/linkis/datasource/client/TestDataSourceClient.scala
index 0000000,574c42c..574c42c
mode 000000,100644..100644
--- a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-authentication/src/test/java/org/apache/linkis/datasource/client/TestDataSourceClient.scala
+++ b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-authentication/src/test/java/org/apache/linkis/datasource/client/TestDataSourceClient.scala
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org