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/03/10 06:21:47 UTC
[incubator-linkis] branch master updated (34debab -> 95f6939)
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git.
from 34debab Merge pull request #1619 from apache/dev-1.1.0-datasource
add 017b283 fix jdbc engine postgresql unsupport sql "show databases;" lead to exec fail (#1610)
add 982bc83 web build version
add 414ba0c build set useStrictFiltering to false
add ce95354 adjust classpath load order for mg-eureka
add 197c480 optimize start/install script
add f2193db adjust distribution.xml for datasource module
add 668dc49 upgrade spring.boot.version from 2.2.13 to 2.3.12
add a5eb711 optimize util of RestfulApiHelper:the attribute method is uniformly obtained through AOP
add 97b423e web adjust dataSourceApi.js url path
add ecb368f adjust known-dependencies.txt
add f999701 datasource:adjust dataSourceId parameter is unified as long type
add 0e46502 Use regex to match against gateway URLs, if matched, let them pass anyway(even if not currently logged in), default: let visualis share URLs pass. (#1636)
add ca6bc3d add unit test for datasource manager server
add e9c770a add unit test for datasource metadata server
add d2fc187 add license for datasource
add 5d49bd3 add spotless format for unit test
add 1a606b8 clear Chinese info
add 1d47e29 change datasource table name
add 981f720 Dev 1.1.0 datasource (#1645)
add 9c58649 fix the value is displayed as the object address when the JDBC engine queries complex type fields. (#1646)
add c53ea79 fix：mdm.service.lib.dir and add some log
add 3874899 optimize datasource client unnecessary parameters
add b565cc1 adjust uniform dataSourceId parameter name
add c10cf07 optimize datasource client unnecessary parameters
add c9e2731 add some log for datasource
add 41f193f fix:TestEngine with ID 'junit-jupiter' failed to discover tests
add 9451eab fix:wrong class of Date
add 884141c adjust uniform dataSourceId parameter name
add 321db8c remove some protected_branches
add d445db0 format of ddl and dml
add 2e0f7ad fix linkis-datasource.ddl (#1651)
new 95f6939 Merge 1.1.0-datasource branch code
The 1 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:
.asf.yaml | 18 -
.../conf/linkis-ps-data-source-manager.properties | 2 +-
.../conf/linkis-ps-metadatamanager.properties | 2 +-
.../src/main/assembly/distribution.xml | 2 +-
.../assembly-combined/sbin/common.sh | 2 +
.../assembly-combined/sbin/ext/linkis-mg-eureka | 2 +-
.../sbin/ext/linkis-ps-data-source-manager | 4 +-
.../sbin/ext/linkis-ps-metadatamanager | 58 +-
.../assembly-combined/sbin/linkis-start-all.sh | 60 ++-
.../assembly-combined/sbin/linkis-stop-all.sh | 29 +-
assembly-combined-package/bin/install.sh | 13 +-
assembly-combined-package/deploy-config/db.sh | 9 +-
.../deploy-config/linkis-env.sh | 36 +-
db/linkis_ddl.sql | 77 +--
db/linkis_dml.sql | 38 +-
db/module/linkis_datasource.sql | 31 +-
linkis-commons/linkis-hadoop-common/pom.xml | 12 +-
.../src/main/assembly/distribution.xml | 2 +-
.../src/main/assembly/distribution.xml | 2 +-
.../io_file/src/main/assembly/distribution.xml | 2 +-
.../engineplugin/jdbc/ConnectionManager.java | 18 +-
.../engineplugin/jdbc/conf/JDBCConfiguration.scala | 2 +
.../jdbc/executer/JDBCEngineConnExecutor.scala | 2 +-
.../src/main/assembly/distribution.xml | 2 +-
.../datasource/client/AbstractRemoteClient.scala | 2 +-
.../request/DataSourceTestConnectAction.scala | 8 +-
.../client/request/DeleteDataSourceAction.scala | 14 +-
.../client/request/ExpireDataSourceAction.scala | 8 +-
.../GetConnectParamsByDataSourceIdAction.scala | 9 +-
.../GetConnectParamsByDataSourceNameAction.scala | 2 +-
.../request/GetDataSourceVersionsAction.scala | 14 +-
.../request/GetKeyTypeDatasourceAction.scala | 2 +-
.../request/MetadataGetPartitionsAction.scala | 8 +-
.../request/PublishDataSourceVersionAction.scala | 8 +-
.../client/request/QueryDataSourceAction.scala | 36 +-
.../client/request/QueryDataSourceEnvAction.scala | 21 +-
.../client/request/UpdateDataSourceAction.scala | 8 +-
.../request/UpdateDataSourceParameterAction.scala | 8 +-
.../client/response/CreateDataSourceResult.scala | 2 +-
.../client/response/DeleteDataSourceResult.scala | 2 +-
.../client/response/ExpireDataSourceResult.scala | 2 +-
.../response/GetAllDataSourceTypesResult.scala | 4 +-
.../GetConnectParamsByDataSourceIdResult.scala | 2 +-
.../GetConnectParamsByDataSourceNameResult.scala | 2 +-
.../response/GetKeyTypeDatasourceResult.scala | 6 +-
.../client/response/QueryDataSourceEnvResult.scala | 4 +-
.../client/response/QueryDataSourceResult.scala | 4 +-
.../client/response/UpdateDataSourceResult.scala | 2 +-
.../linkis-datasource-manager/server/pom.xml | 30 +-
.../server/src/main/assembly/distribution.xml | 147 ++++-
.../core/dao/mapper/DataSouceMapper.xml | 45 +-
.../core/dao/mapper/DataSourceEnvMapper.xml | 27 +-
.../core/dao/mapper/DataSourceParamKeyMapper.xml | 4 +-
.../core/dao/mapper/DataSourceTypeEnvMapper.xml | 8 +-
.../core/dao/mapper/DataSourceTypeMapper.xml | 4 +-
.../core/dao/mapper/DataSourceVersionMapper.xml | 10 +-
.../core/restful/DataSourceAdminRestfulApi.java | 30 +-
.../core/restful/DataSourceCoreRestfulApi.java | 171 +++---
.../core/restful/DataSourceOperateRestfulApi.java | 1 -
.../core/restful/RestfulApiHelper.java | 31 +-
.../core/receivers/DsmReceiver.scala | 9 +-
.../linkis/datasourcemanager/core}/Scan.java | 4 +-
.../core}/WebApplicationServer.java | 2 +-
.../datasourcemanager/core}/dao/BaseDaoTest.java | 4 +-
.../core/dao/DataSourceDaoTest.java | 200 +++++++
.../core/dao/DataSourceEnvDaoTest.java | 135 +++++
.../core/dao/DataSourceParamKeyDaoTest.java | 57 ++
.../core/dao/DataSourceTypeDaoTest.java} | 40 +-
.../core/dao/DataSourceVersionDaoTest.java | 96 ++++
.../restful/DataSourceAdminRestfulApiTest.java | 204 +++++++
.../core/restful/DataSourceCoreRestfulApiTest.java | 590 +++++++++++++++++++++
.../restful/DataSourceOperateRestfulApiTest.java | 46 ++
.../datasourcemanager/core/restful/MvcUtils.java | 110 ++++
.../core/service/BmlAppServiceTest.java | 83 +++
.../core/service/DataSourceInfoServiceTest.java | 337 ++++++++++++
.../core/service/DataSourceRelateServiceTest.java} | 21 +-
.../core/service/MetadataOperateServiceTest.java | 90 ++++
.../src/test/resources/application.properties | 31 +-
.../server/src/test/resources/create.sql | 102 ++++
.../server/src/main/assembly/distribution.xml | 2 +-
.../server/loader/MetaClassLoaderManager.java | 17 +-
.../server/restful/MetadataCoreRestful.java | 26 +-
.../service/impl/MetadataAppServiceImpl.java | 3 +-
.../server/receiver/BaseMetaReceiver.scala | 2 +-
.../server/WebApplicationServer.java} | 11 +-
.../server/restful/MetadataCoreRestfulTest.java | 240 +++++++++
.../metadatamanager/server/restful/MvcUtils.java | 109 ++++
.../src/test/resources/application.properties | 21 +
.../src/main/assembly/distribution.xml | 2 +-
.../kafka/src/main/assembly/distribution.xml | 2 +-
.../mysql/src/main/assembly/distribution.xml | 2 +-
.../jobhistory/restful/api/QueryRestfulApi.java | 2 +-
.../gateway/config/GatewayConfiguration.scala | 3 +
.../linkis/gateway/security/SecurityFilter.scala | 4 +
.../src/main/assembly/distribution.xml | 2 +-
pom.xml | 23 +-
tool/dependencies/known-dependencies.txt | 260 +++++----
web/.env | 2 +-
web/package.json | 2 +-
web/src/apps/linkis/i18n/common/en.json | 28 +-
.../apps/linkis/module/datasource/dataSourceApi.js | 60 +--
.../module/datasource/datasourceForm/index.vue | 4 +-
web/src/apps/linkis/module/datasource/index.vue | 90 ++--
web/src/apps/linkis/module/header/index.vue | 8 +-
web/vue.config.js | 5 +-
105 files changed, 3399 insertions(+), 803 deletions(-)
copy linkis-public-enhancements/{linkis-publicservice/linkis-jobhistory/src/test/java/org/apache/linkis/jobhistory => linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/datasourcemanager/core}/Scan.java (89%)
copy linkis-public-enhancements/{linkis-publicservice/linkis-jobhistory/src/test/java/org/apache/linkis/jobhistory => linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/datasourcemanager/core}/WebApplicationServer.java (96%)
copy linkis-public-enhancements/{linkis-publicservice/linkis-jobhistory/src/test/java/org/apache/linkis/jobhistory => linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/datasourcemanager/core}/dao/BaseDaoTest.java (91%)
create mode 100644 linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/datasourcemanager/core/dao/DataSourceDaoTest.java
create mode 100644 linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/datasourcemanager/core/dao/DataSourceEnvDaoTest.java
create mode 100644 linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/datasourcemanager/core/dao/DataSourceParamKeyDaoTest.java
copy linkis-public-enhancements/{linkis-publicservice/linkis-jobhistory/src/test/java/org/apache/linkis/jobhistory/entity/JobHistoryTest.java => linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/datasourcemanager/core/dao/DataSourceTypeDaoTest.java} (52%)
create mode 100644 linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/datasourcemanager/core/dao/DataSourceVersionDaoTest.java
create mode 100644 linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceAdminRestfulApiTest.java
create mode 100644 linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceCoreRestfulApiTest.java
create mode 100644 linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceOperateRestfulApiTest.java
create mode 100644 linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/datasourcemanager/core/restful/MvcUtils.java
create mode 100644 linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/datasourcemanager/core/service/BmlAppServiceTest.java
create mode 100644 linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/datasourcemanager/core/service/DataSourceInfoServiceTest.java
copy linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/{main/java/org/apache/linkis/datasourcemanager/core/service/DataSourceOpService.java => test/java/org/apache/linkis/datasourcemanager/core/service/DataSourceRelateServiceTest.java} (68%)
create mode 100644 linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/datasourcemanager/core/service/MetadataOperateServiceTest.java
copy linkis-public-enhancements/{linkis-publicservice/linkis-jobhistory => linkis-datasource/linkis-datasource-manager/server}/src/test/resources/application.properties (68%)
create mode 100644 linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/resources/create.sql
copy linkis-public-enhancements/{linkis-publicservice/linkis-jobhistory/src/test/java/org/apache/linkis/jobhistory/Scan.java => linkis-datasource/linkis-metadata-manager/server/src/test/java/org/apache/linkis/metadatamanager/server/WebApplicationServer.java} (78%)
create mode 100644 linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/test/java/org/apache/linkis/metadatamanager/server/restful/MetadataCoreRestfulTest.java
create mode 100644 linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/test/java/org/apache/linkis/metadatamanager/server/restful/MvcUtils.java
create mode 100644 linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/test/resources/application.properties
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 01/01: Merge 1.1.0-datasource branch code
Posted by pe...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit 95f6939352b581a016f6b8084422a89710600e01
Merge: 34debab 2e0f7ad
Author: peacewong <wp...@gmail.com>
AuthorDate: Thu Mar 10 14:21:39 2022 +0800
Merge 1.1.0-datasource branch code
Merge 1.1.0-datasource branch code
.asf.yaml | 18 -
.../conf/linkis-ps-data-source-manager.properties | 2 +-
.../conf/linkis-ps-metadatamanager.properties | 2 +-
.../src/main/assembly/distribution.xml | 2 +-
.../assembly-combined/sbin/common.sh | 2 +
.../assembly-combined/sbin/ext/linkis-mg-eureka | 2 +-
.../sbin/ext/linkis-ps-data-source-manager | 4 +-
.../sbin/ext/linkis-ps-metadatamanager | 58 +-
.../assembly-combined/sbin/linkis-start-all.sh | 60 ++-
.../assembly-combined/sbin/linkis-stop-all.sh | 29 +-
assembly-combined-package/bin/install.sh | 13 +-
assembly-combined-package/deploy-config/db.sh | 9 +-
.../deploy-config/linkis-env.sh | 36 +-
db/linkis_ddl.sql | 77 +--
db/linkis_dml.sql | 38 +-
db/module/linkis_datasource.sql | 31 +-
linkis-commons/linkis-hadoop-common/pom.xml | 12 +-
.../src/main/assembly/distribution.xml | 2 +-
.../src/main/assembly/distribution.xml | 2 +-
.../io_file/src/main/assembly/distribution.xml | 2 +-
.../engineplugin/jdbc/ConnectionManager.java | 18 +-
.../engineplugin/jdbc/conf/JDBCConfiguration.scala | 2 +
.../jdbc/executer/JDBCEngineConnExecutor.scala | 2 +-
.../src/main/assembly/distribution.xml | 2 +-
.../datasource/client/AbstractRemoteClient.scala | 2 +-
.../request/DataSourceTestConnectAction.scala | 8 +-
.../client/request/DeleteDataSourceAction.scala | 14 +-
.../client/request/ExpireDataSourceAction.scala | 8 +-
.../GetConnectParamsByDataSourceIdAction.scala | 9 +-
.../GetConnectParamsByDataSourceNameAction.scala | 2 +-
.../request/GetDataSourceVersionsAction.scala | 14 +-
.../request/GetKeyTypeDatasourceAction.scala | 2 +-
.../request/MetadataGetPartitionsAction.scala | 8 +-
.../request/PublishDataSourceVersionAction.scala | 8 +-
.../client/request/QueryDataSourceAction.scala | 36 +-
.../client/request/QueryDataSourceEnvAction.scala | 21 +-
.../client/request/UpdateDataSourceAction.scala | 8 +-
.../request/UpdateDataSourceParameterAction.scala | 8 +-
.../client/response/CreateDataSourceResult.scala | 2 +-
.../client/response/DeleteDataSourceResult.scala | 2 +-
.../client/response/ExpireDataSourceResult.scala | 2 +-
.../response/GetAllDataSourceTypesResult.scala | 4 +-
.../GetConnectParamsByDataSourceIdResult.scala | 2 +-
.../GetConnectParamsByDataSourceNameResult.scala | 2 +-
.../response/GetKeyTypeDatasourceResult.scala | 6 +-
.../client/response/QueryDataSourceEnvResult.scala | 4 +-
.../client/response/QueryDataSourceResult.scala | 4 +-
.../client/response/UpdateDataSourceResult.scala | 2 +-
.../linkis-datasource-manager/server/pom.xml | 30 +-
.../server/src/main/assembly/distribution.xml | 147 ++++-
.../core/dao/mapper/DataSouceMapper.xml | 45 +-
.../core/dao/mapper/DataSourceEnvMapper.xml | 27 +-
.../core/dao/mapper/DataSourceParamKeyMapper.xml | 4 +-
.../core/dao/mapper/DataSourceTypeEnvMapper.xml | 8 +-
.../core/dao/mapper/DataSourceTypeMapper.xml | 4 +-
.../core/dao/mapper/DataSourceVersionMapper.xml | 10 +-
.../core/restful/DataSourceAdminRestfulApi.java | 30 +-
.../core/restful/DataSourceCoreRestfulApi.java | 171 +++---
.../core/restful/DataSourceOperateRestfulApi.java | 1 -
.../core/restful/RestfulApiHelper.java | 31 +-
.../core/receivers/DsmReceiver.scala | 9 +-
.../linkis/datasourcemanager/core/Scan.java} | 16 +-
.../core/WebApplicationServer.java} | 22 +-
.../datasourcemanager/core/dao/BaseDaoTest.java} | 25 +-
.../core/dao/DataSourceDaoTest.java | 200 +++++++
.../core/dao/DataSourceEnvDaoTest.java | 135 +++++
.../core/dao/DataSourceParamKeyDaoTest.java | 57 ++
.../core/dao/DataSourceTypeDaoTest.java | 48 ++
.../core/dao/DataSourceVersionDaoTest.java | 96 ++++
.../restful/DataSourceAdminRestfulApiTest.java | 204 +++++++
.../core/restful/DataSourceCoreRestfulApiTest.java | 590 +++++++++++++++++++++
.../restful/DataSourceOperateRestfulApiTest.java | 46 ++
.../datasourcemanager/core/restful/MvcUtils.java | 110 ++++
.../core/service/BmlAppServiceTest.java | 83 +++
.../core/service/DataSourceInfoServiceTest.java | 337 ++++++++++++
.../core/service/DataSourceRelateServiceTest.java} | 25 +-
.../core/service/MetadataOperateServiceTest.java | 90 ++++
.../src/test/resources/application.properties | 42 ++
.../server/src/test/resources/create.sql | 102 ++++
.../server/src/main/assembly/distribution.xml | 2 +-
.../server/loader/MetaClassLoaderManager.java | 17 +-
.../server/restful/MetadataCoreRestful.java | 26 +-
.../service/impl/MetadataAppServiceImpl.java | 3 +-
.../server/receiver/BaseMetaReceiver.scala | 2 +-
.../server/WebApplicationServer.java} | 19 +-
.../server/restful/MetadataCoreRestfulTest.java | 240 +++++++++
.../metadatamanager/server/restful/MvcUtils.java | 109 ++++
.../src/test/resources/application.properties | 21 +
.../src/main/assembly/distribution.xml | 2 +-
.../kafka/src/main/assembly/distribution.xml | 2 +-
.../mysql/src/main/assembly/distribution.xml | 2 +-
.../jobhistory/restful/api/QueryRestfulApi.java | 2 +-
.../gateway/config/GatewayConfiguration.scala | 3 +
.../linkis/gateway/security/SecurityFilter.scala | 4 +
.../src/main/assembly/distribution.xml | 2 +-
pom.xml | 23 +-
tool/dependencies/known-dependencies.txt | 260 +++++----
web/.env | 2 +-
web/package.json | 2 +-
web/src/apps/linkis/i18n/common/en.json | 28 +-
.../apps/linkis/module/datasource/dataSourceApi.js | 60 +--
.../module/datasource/datasourceForm/index.vue | 4 +-
web/src/apps/linkis/module/datasource/index.vue | 90 ++--
web/src/apps/linkis/module/header/index.vue | 8 +-
web/vue.config.js | 5 +-
105 files changed, 3490 insertions(+), 796 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org