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/24 11:30:38 UTC
[incubator-linkis] branch master updated (95f6939 -> 8f3f7f9)
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 95f6939 Merge 1.1.0-datasource branch code
add adf550a use spring-boot-starter-jetty(wip) (#1660)
add 6cbcfa7 adjust module order to avoid missing server/* datasource lib (#1717)
add 9fbef31 remove redundanct dependencies
add 6dbb688 Merge pull request #1716 from Celebrate-future/master
add 01205b3 Fix the problem that the rows of the result set table field of the python engine's showDF function are reversed (#1731)
add 06c985c [enhancement] #1724 support clickhouse jdbc (#1752)
add b6d8b32 fix datasource api resultset fields (#1762)
add fc6ffbf [feature] #1452 support "hive.aux.jars.path" for hive engine (#1777)
add 95bc80e fix:DWSHttpMessageResult cannot distinguish different methods(GET/DELETE) of the same RequestMapping request (#1778)
add d02214a remove unused DataSourceTypeEnvDao.java
add dd2c0e5 [Web] FAQ page redirect to "https://linkis.apache.org/zh-CN/faq/main/ (#1786)
add a75ea4d Provide the hook interface for data source parameters and embed into (#1788)
add 0852b6d add test for datasource client (#1796)
new 8f3f7f9 Merge pull request #1797 from apache/dev-1.1.0
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:
.../assembly-combined/conf/token.properties | 5 +-
.../assembly-combined/sbin/linkis-start-all.sh | 8 +-
.../assembly-combined/sbin/linkis-stop-all.sh | 4 +-
assembly-combined-package/bin/install.sh | 2 +-
.../deploy-config/linkis-env.sh | 4 +-
db/linkis_dml.sql | 2 +-
linkis-commons/linkis-module/pom.xml | 24 +-
.../linkis-manager-service-common/pom.xml | 102 ++-
.../hive/conf/HiveEngineConfiguration.scala | 1 +
.../hive/creation/HiveEngineConnFactory.scala | 9 +-
.../engineconn-plugins/jdbc/pom.xml | 1 -
.../engineplugin/jdbc/conf/JDBCConfiguration.scala | 2 +-
.../python/executor/PythonSession.scala | 2 +-
.../client/request/DeleteDataSourceAction.scala | 2 +-
.../request/MetadataGetPartitionsAction.scala | 8 +
.../request/PublishDataSourceVersionAction.scala | 8 +-
.../client/response/DeleteDataSourceResult.scala | 2 +-
.../linkis/datasource/client/TestHiveClient.scala | 143 ++++
.../linkis/datasource/client/TestMysqlClient.scala | 149 ++++
.../linkis-datasource-manager/server/pom.xml | 2 +-
.../core/dao/DataSourceTypeEnvDao.java | 41 --
.../core/dao/mapper/DataSouceMapper.xml | 43 +-
.../core/dao/mapper/DataSourceEnvMapper.xml | 40 +-
.../core/dao/mapper/DataSourceParamKeyMapper.xml | 2 +-
.../core/dao/mapper/DataSourceTypeEnvMapper.xml | 33 -
.../core/dao/mapper/DataSourceTypeMapper.xml | 2 +-
.../core/dao/mapper/DataSourceVersionMapper.xml | 15 +-
.../core/restful/DataSourceAdminRestfulApi.java | 2 +-
.../core/restful/DataSourceCoreRestfulApi.java | 35 +-
.../core/restful/DataSourceOperateRestfulApi.java | 12 +-
.../hooks/DataSourceParamsHook.java} | 26 +-
.../service/hooks/DefaultDataSourceParamsHook.java | 19 +-
.../service/impl/DataSourceInfoServiceImpl.java | 30 +-
.../core/restful/DataSourceCoreRestfulApiTest.java | 2 +-
.../core/service/DataSourceInfoServiceTest.java | 2 -
.../linkis-metadata-manager/server/pom.xml | 2 +-
.../server/restful/MetadataCoreRestful.java | 3 +
.../server/service/MetadataAppService.java | 7 +-
.../service/impl/MetadataAppServiceImpl.java | 9 +-
.../server/restful/MetadataCoreRestfulTest.java | 4 +-
.../service/elasticsearch/pom.xml | 2 +-
.../metadatamanager/service/EsMetaService.java | 3 -
.../linkis-metadata-manager/service/hive/pom.xml | 19 +-
.../metadatamanager/service/HiveMetaService.java | 33 +-
.../linkis-metadata-manager/service/kafka/pom.xml | 2 +-
.../metadatamanager/service/KafkaMetaService.java | 22 +-
.../linkis-metadata-manager/service/mysql/pom.xml | 2 +-
.../metadatamanager/service/MysqlMetaService.java | 3 -
.../linkis-datasource/pom.xml | 2 +-
linkis-public-enhancements/pom.xml | 2 +-
.../linkis-gateway-core/pom.xml | 15 -
tool/dependencies/known-dependencies.txt | 17 +-
web/src/apps/linkis/i18n/common/en.json | 3 +-
web/src/apps/linkis/i18n/common/zh.json | 3 +-
web/src/apps/linkis/module/FAQ/index.vue | 9 +-
.../module/datasource/datasourceForm/index.vue | 346 +++++-----
web/src/apps/linkis/module/datasource/index.vue | 746 ++++++++++++---------
57 files changed, 1306 insertions(+), 732 deletions(-)
create mode 100644 linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/test/java/org/apache/linkis/datasource/client/TestHiveClient.scala
create mode 100644 linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/test/java/org/apache/linkis/datasource/client/TestMysqlClient.scala
delete mode 100644 linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/dao/DataSourceTypeEnvDao.java
delete mode 100644 linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/dao/mapper/DataSourceTypeEnvMapper.xml
copy linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/{dao/DataSourceTypeDao.java => service/hooks/DataSourceParamsHook.java} (64%)
copy linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-loader/src/main/java/org/apache/linkis/manager/engineplugin/manager/utils/ExceptionHelper.java => linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/service/hooks/DefaultDataSourceParamsHook.java (64%)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 01/01: Merge pull request #1797 from apache/dev-1.1.0
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 8f3f7f97c34f36275bc0680d964ced74b357c6ab
Merge: 95f6939 0852b6d
Author: peacewong <wp...@gmail.com>
AuthorDate: Thu Mar 24 19:30:31 2022 +0800
Merge pull request #1797 from apache/dev-1.1.0
Merge 1.1.0-datasource branch code
.../assembly-combined/conf/token.properties | 5 +-
.../assembly-combined/sbin/linkis-start-all.sh | 8 +-
.../assembly-combined/sbin/linkis-stop-all.sh | 4 +-
assembly-combined-package/bin/install.sh | 2 +-
.../deploy-config/linkis-env.sh | 4 +-
db/linkis_dml.sql | 2 +-
linkis-commons/linkis-module/pom.xml | 24 +-
.../linkis-manager-service-common/pom.xml | 102 ++-
.../hive/conf/HiveEngineConfiguration.scala | 1 +
.../hive/creation/HiveEngineConnFactory.scala | 9 +-
.../engineconn-plugins/jdbc/pom.xml | 1 -
.../engineplugin/jdbc/conf/JDBCConfiguration.scala | 2 +-
.../python/executor/PythonSession.scala | 2 +-
.../client/request/DeleteDataSourceAction.scala | 2 +-
.../request/MetadataGetPartitionsAction.scala | 8 +
.../request/PublishDataSourceVersionAction.scala | 8 +-
.../client/response/DeleteDataSourceResult.scala | 2 +-
.../linkis/datasource/client/TestHiveClient.scala | 143 ++++
.../linkis/datasource/client/TestMysqlClient.scala | 149 ++++
.../linkis-datasource-manager/server/pom.xml | 2 +-
.../core/dao/mapper/DataSouceMapper.xml | 43 +-
.../core/dao/mapper/DataSourceEnvMapper.xml | 40 +-
.../core/dao/mapper/DataSourceParamKeyMapper.xml | 2 +-
.../core/dao/mapper/DataSourceTypeEnvMapper.xml | 33 -
.../core/dao/mapper/DataSourceTypeMapper.xml | 2 +-
.../core/dao/mapper/DataSourceVersionMapper.xml | 15 +-
.../core/restful/DataSourceAdminRestfulApi.java | 2 +-
.../core/restful/DataSourceCoreRestfulApi.java | 35 +-
.../core/restful/DataSourceOperateRestfulApi.java | 12 +-
.../hooks/DataSourceParamsHook.java} | 30 +-
.../hooks/DefaultDataSourceParamsHook.java} | 33 +-
.../service/impl/DataSourceInfoServiceImpl.java | 30 +-
.../core/restful/DataSourceCoreRestfulApiTest.java | 2 +-
.../core/service/DataSourceInfoServiceTest.java | 2 -
.../linkis-metadata-manager/server/pom.xml | 2 +-
.../server/restful/MetadataCoreRestful.java | 3 +
.../server/service/MetadataAppService.java | 7 +-
.../service/impl/MetadataAppServiceImpl.java | 9 +-
.../server/restful/MetadataCoreRestfulTest.java | 4 +-
.../service/elasticsearch/pom.xml | 2 +-
.../metadatamanager/service/EsMetaService.java | 3 -
.../linkis-metadata-manager/service/hive/pom.xml | 19 +-
.../metadatamanager/service/HiveMetaService.java | 33 +-
.../linkis-metadata-manager/service/kafka/pom.xml | 2 +-
.../metadatamanager/service/KafkaMetaService.java | 22 +-
.../linkis-metadata-manager/service/mysql/pom.xml | 2 +-
.../metadatamanager/service/MysqlMetaService.java | 3 -
.../linkis-datasource/pom.xml | 2 +-
linkis-public-enhancements/pom.xml | 2 +-
.../linkis-gateway-core/pom.xml | 15 -
tool/dependencies/known-dependencies.txt | 17 +-
web/src/apps/linkis/i18n/common/en.json | 3 +-
web/src/apps/linkis/i18n/common/zh.json | 3 +-
web/src/apps/linkis/module/FAQ/index.vue | 9 +-
.../module/datasource/datasourceForm/index.vue | 346 +++++-----
web/src/apps/linkis/module/datasource/index.vue | 746 ++++++++++++---------
56 files changed, 1308 insertions(+), 707 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org