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/28 13:26:43 UTC
[incubator-linkis] 01/01: Merge pull request #1582 from apache/dev-1.1.0-datasource
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 2ab0b6f2ea8a14bdff8d07408824a813c3dabd8b
Merge: 16e4b59 6a58e71
Author: peacewong <wp...@gmail.com>
AuthorDate: Mon Feb 28 21:24:14 2022 +0800
Merge pull request #1582 from apache/dev-1.1.0-datasource
Merge 1.1.0-datasource branch code
.../workflows/check_third_party_dependencies.yml | 56 +++
.../assembly-combined/bin/linkis-cli | 15 +-
.../assembly-combined/bin/linkis-cli-hive | 2 +-
.../assembly-combined/bin/linkis-cli-spark-submit | 2 +-
.../assembly-combined/bin/linkis-cli-start | 108 -----
.../conf/linkis-ps-data-source-manager.properties | 38 +-
.../conf/linkis-ps-metadatamanager.properties | 16 +-
.../assembly-combined/conf/linkis.properties | 9 +-
.../assembly-combined/sbin/ext/linkis-common-start | 2 +
.../assembly-combined/sbin/ext/linkis-mg-eureka | 10 +-
.../assembly-combined/sbin/ext/linkis-mg-gateway | 3 +
.../sbin/ext/linkis-ps-data-source-manager | 39 +-
...nkis-common-start => linkis-ps-metadatamanager} | 32 +-
.../src/main/assembly/assembly.xml | 25 ++
assembly-combined-package/bin/checkEnv.sh | 60 +++
assembly-combined-package/bin/common.sh | 21 +-
assembly-combined-package/bin/install.sh | 180 ++++----
db/linkis_ddl.sql | 111 ++++-
db/linkis_dml.sql | 18 +
db/module/linkis_datasource.sql | 127 ++++++
linkis-commons/linkis-common/pom.xml | 5 +
linkis-commons/linkis-message-scheduler/pom.xml | 7 -
.../linkis/message/SchedulerMessageTest.java | 6 +-
linkis-commons/linkis-module/pom.xml | 28 +-
.../scala/org/apache/linkis/server/Message.scala | 12 +-
.../linkis/server/security/SecurityFilter.scala | 9 +-
linkis-commons/linkis-mybatis/pom.xml | 5 +-
linkis-commons/linkis-rpc/pom.xml | 25 --
linkis-commons/linkis-storage/pom.xml | 5 -
.../src/main/assembly/distribution.xml | 40 ++
.../application/LinkisClientApplicationTest.java | 10 +-
.../interactor/execution/LinkisExecutorTest.java | 10 +-
.../interactor/job/LinkisJobBuilderTest.java | 12 +-
.../handler/CommandExceptionHandlerTest.java | 6 +-
.../command/fitter/SingleTplFitterTest.java | 25 +-
.../command/parser/SingleCmdParserTest.java | 10 +-
.../interactor/properties/StdPropsLoaderTest.java | 15 +-
.../cli/core/interactor/var/StdVarAccessTest.java | 28 +-
.../linkis-client/linkis-cli/pom.xml | 46 +-
.../src/main/assembly/distribution.xml | 11 +
.../linkis-entrance/pom.xml | 7 -
.../src/main/assembly/distribution.xml | 3 +
.../entrance/restful/EntranceRestfulApi.java | 2 +-
.../entrance/restful/EntranceRestfulRemote.scala | 2 +-
.../src/main/assembly/distribution.xml | 24 +
.../linkis-manager-persistence/pom.xml | 16 -
.../src/test/java/PersistenceTest.java | 6 +-
.../engineconn-plugins/flink/pom.xml | 6 -
.../hive/executor/HiveEngineConnExecutor.scala | 2 +-
.../engineplugin/jdbc/ConnectionManager.java | 9 +-
.../executor/PipelineEngineConnExecutor.scala | 2 +-
.../python/executor/PythonEngineConnExecutor.scala | 2 +-
.../shell/executor/ShellEngineConnExecutor.scala | 2 +-
.../common/conf/EngineConnPluginConf.scala | 2 +-
.../resource/GenericEngineResourceFactory.scala | 2 +-
.../src/main/assembly/distribution.xml | 9 +
.../linkis-context-service/linkis-cs-cache/pom.xml | 6 -
.../test/service/TestContextCacheService.java | 6 +-
.../linkis-cs-client/pom.xml | 15 -
.../linkis/cs/client/test/restful/RestfulTest.java | 2 +-
.../linkis/cs/client/test/service/TestRemove.java | 2 +-
.../linkis-cs-listener/pom.xml | 6 -
.../linkis-cs-persistence/pom.xml | 6 -
.../linkis-cs-search/pom.xml | 13 -
.../java/org/apache/linkis/cs/ContainsTest.java | 13 +-
.../org/apache/linkis/cs/ContextScopeTest.java | 13 +-
.../org/apache/linkis/cs/ContextSearchTest.java | 11 +-
.../java/org/apache/linkis/cs/ContextTypeTest.java | 11 +-
.../test/java/org/apache/linkis/cs/RegexTest.java | 13 +-
.../org/apache/linkis/cs/parser/ApiJsonTest.java | 7 +-
.../linkis-cs-server/pom.xml | 6 -
.../src/main/assembly/distribution.xml | 9 +
.../datasourcemanager/common/pom.xml | 73 ---
.../datasourcemanager/common/ServiceErrorCode.java | 38 --
.../common/domain/DataSource.java | 245 ----------
.../common/domain/DataSourceEnv.java | 189 --------
.../domain/DataSourceParamKeyDefinition.java | 233 ----------
.../common/domain/DataSourceType.java | 78 ----
.../datasourcemanager/common/util/CryptoUtils.java | 104 -----
.../common/util/PatternInjectUtils.java | 177 --------
.../datasourcemanager/common/util/json/Json.java | 114 -----
.../common/protocol/DsmQueryProtocol.scala | 40 --
.../datasourcemanager/server/pom.xml | 134 ------
.../datasourcemanager/core/dao/DataSourceDao.java | 77 ----
.../core/dao/DataSourceEnvDao.java | 69 ---
.../core/dao/DataSourceParamKeyDao.java | 42 --
.../core/dao/DataSourceTypeDao.java | 37 --
.../core/dao/DataSourceTypeEnvDao.java | 38 --
.../core/dao/mapper/DataSouceMapper.xml | 182 --------
.../core/dao/mapper/DataSourceEnvMapper.xml | 101 -----
.../core/dao/mapper/DataSourceParamKeyMapper.xml | 50 ---
.../core/dao/mapper/DataSourceTypeEnvMapper.xml | 33 --
.../core/dao/mapper/DataSourceTypeMapper.xml | 36 --
.../CustomMultiPartFormDataTransformer.java | 315 -------------
.../core/formdata/FormStreamContent.java | 86 ----
.../formdata/MultiPartFormDataTransformer.java | 43 --
.../core/restful/DataSourceAdminRestfulApi.java | 220 ---------
.../core/restful/DataSourceCoreRestfulApi.java | 257 -----------
.../core/restful/DataSourceOperateRestfulApi.java | 118 -----
.../core/restful/RestfulApiHelper.java | 115 -----
.../exception/BeanValidationExceptionMapper.java | 41 --
.../core/service/BmlAppService.java | 50 ---
.../core/service/DataSourceInfoService.java | 120 -----
.../core/service/DataSourceOpService.java | 21 -
.../core/service/DataSourceRelateService.java | 54 ---
.../core/service/MetadataOperateService.java | 38 --
.../core/service/impl/BmlAppServiceImpl.java | 104 -----
.../service/impl/DataSourceInfoServiceImpl.java | 369 ---------------
.../service/impl/DataSourceRelateServiceImpl.java | 58 ---
.../service/impl/MetadataOperateServiceImpl.java | 110 -----
.../validate/DataSourceParameterValidator.java | 82 ----
.../core/validate/ParameterValidateException.java | 32 --
.../core/validate/ParameterValidateStrategy.java | 41 --
.../core/validate/ParameterValidator.java | 45 --
.../strategy/RegExpParameterValidateStrategy.java | 64 ---
.../strategy/TypeParameterValidateStrategy.java | 71 ---
.../datasourcemanager/core/vo/DataSourceEnvVo.java | 51 ---
.../datasourcemanager/core/vo/DataSourceVo.java | 82 ----
.../server/src/main/resources/application.yml | 39 --
.../server/src/main/resources/log4j2.xml | 39 --
.../core/receivers/DsmReceiver.scala | 78 ----
.../common/domain/DataSource.java | 6 +-
.../common/domain/DataSourceEnv.java | 6 +-
.../domain/DataSourceParamKeyDefinition.java | 4 +-
.../common/domain/DataSourceParameter.java | 4 +-
.../common/domain/DataSourceType.java | 4 +-
.../common/domain/DatasourceVersion.java | 4 +-
.../core/restful/DataSourceCoreRestfulApi.java | 10 +-
.../common/domain/MetaColumnInfo.java | 4 +-
.../common/domain/MetaPartitionInfo.java | 4 +-
.../server/loader/MetaClassLoaderManager.java | 2 +-
.../server/receiver/BaseMetaReceiver.scala | 68 +++
.../linkis-metadata-manager/service/hive/pom.xml | 2 +-
.../metadatamanager/common/pom.xml | 77 ----
.../apache/linkis/metadatamanager/common/Json.java | 114 -----
.../metadatamanager/common/MdmConfiguration.java | 29 --
.../common/cache/CacheConfiguration.java | 29 --
.../metadatamanager/common/cache/CacheManager.java | 43 --
.../common/cache/ConnCacheManager.java | 57 ---
.../common/domain/MetaColumnInfo.java | 67 ---
.../common/domain/MetaPartitionInfo.java | 96 ----
.../common/exception/MetaRuntimeException.java | 32 --
.../common/service/AbstractMetaService.java | 214 ---------
.../common/service/BaseMetadataService.java | 32 --
.../common/service/MetadataConnection.java | 58 ---
.../common/service/MetadataDbService.java | 68 ---
.../common/service/MetadataService.java | 21 -
.../common/protocol/MetadataOperateProtocol.scala | 31 --
.../common/protocol/MetadataQueryProtocol.scala | 61 ---
.../common/receiver/BaseMetaReceiver.scala | 64 ---
.../metadatamanager/server/pom.xml | 94 ----
.../server/restful/MetadataCoreRestful.java | 134 ------
.../server/service/MetadataAppService.java | 69 ---
.../service/impl/MetadataAppServiceImpl.java | 153 -------
.../server/src/main/resources/log4j2.xml | 39 --
.../metadatamanager/service/elasticsearch/pom.xml | 81 ----
.../metadatamanager/service/ElasticConnection.java | 140 ------
.../service/ElasticMetaService.java | 87 ----
.../service/ElasticParamsMapper.java | 34 --
.../elasticsearch/src/main/resources/log4j2.xml | 39 --
.../service/receiver/ElasticReceiver.scala | 33 --
.../metadatamanager/service/hive/pom.xml | 161 -------
.../metadatamanager/service/HiveConnection.java | 139 ------
.../metadatamanager/service/HiveMetaService.java | 197 --------
.../metadatamanager/service/HiveParamsMapper.java | 33 --
.../hive/src/main/resources/application.yml | 38 --
.../hive/src/main/resources/linkis.properties | 25 --
.../service/hive/src/main/resources/log4j2.xml | 39 --
.../service/receiver/HiveReceiver.scala | 33 --
.../metadatamanager/service/mysql/pom.xml | 86 ----
.../metadatamanager/service/SqlConnection.java | 210 ---------
.../metadatamanager/service/SqlMetaService.java | 79 ----
.../metadatamanager/service/SqlParamsMapper.java | 38 --
.../mysql/src/main/resources/application.yml | 38 --
.../mysql/src/main/resources/linkis.properties | 22 -
.../service/mysql/src/main/resources/log4j2.xml | 39 --
.../service/receiver/SqlReceiver.scala | 33 --
.../linkis-publicservice/distribution.xml | 16 +
.../linkis-error-code-server/pom.xml | 29 --
.../linkis-instance-label-server/pom.xml | 5 -
.../linkis/jobhistory/dao/JobDetailMapper.java | 4 +-
.../java/org/apache/linkis/jobhistory/Scan.java} | 18 +-
.../linkis/jobhistory/WebApplicationServer.java} | 34 +-
.../apache/linkis/jobhistory/dao/BaseDaoTest.java} | 36 +-
.../linkis/jobhistory/dao/JobDetailMapperTest.java | 131 ++++++
.../linkis/jobhistory/entity/JobHistoryTest.java | 46 ++
.../restful/api/QueryRestfulApiTest.java | 181 ++++++++
.../service/JobHistoryDetailQueryServiceTest.java | 144 ++++++
.../src/test/resources/application.properties | 59 +++
.../src/test/resources/create.sql} | 37 +-
.../src/test}/resources/linkis.properties | 11 +-
.../linkis-storage-script-dev-server/pom.xml | 7 -
.../linkis-service-discovery/linkis-eureka/pom.xml | 2 -
.../src/main/assembly/distribution.xml | 111 +++++
.../linkis-gateway-core/pom.xml | 1 -
.../linkis-gateway-server-support/pom.xml | 3 -
.../linkis-spring-cloud-gateway/pom.xml | 6 -
pom.xml | 117 ++++-
tool/dependencies/diff-dependenies.sh | 38 --
tool/dependencies/known-dependencies.txt | 497 ++++++++++++---------
.../regenerate_konwn_dependencies_txt.sh | 38 +-
tool/dependencies/third-party-dependencies.txt | 437 ------------------
web/install.sh | 2 +-
203 files changed, 2096 insertions(+), 9495 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org