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 08:02:35 UTC

[incubator-linkis] 01/01: Merge pull request #1534 from WeDataSphere/dev-udf

This is an automated email from the ASF dual-hosted git repository.

peacewong pushed a commit to branch dev-1.1.1
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git

commit 246d35d769ebd64f0995740ecc062b02cad46cde
Merge: 41a979b 1e9717a
Author: Alexyang <xu...@qq.com>
AuthorDate: Mon Feb 21 12:10:43 2022 +0800

    Merge pull request #1534 from WeDataSphere/dev-udf
    
    Merge 1.1.0-datasource branch code

 .../conf/linkis-mg-gateway.properties              |   4 +-
 .../conf/linkis-ps-publicservice.properties        |   2 +-
 .../linkis-streaming-engineconn/pom.xml            |   2 +-
 .../linkis-jdbc-driver/pom.xml                     |   2 +-
 .../main/resources/linkis-engineconn.properties    |   2 +-
 .../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 ----
 .../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 --
 .../CustomMultiPartFormDataTransformer.java        | 315 ---------
 .../core/formdata/FormDataTransformerFactory.java  |  38 --
 .../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/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 ---
 .../datasourcemanager/core/vo/PageViewVo.java      |  39 --
 .../server/src/main/resources/application.yml      |  39 --
 .../server/src/main/resources/linkis.properties    |  33 -
 .../server/src/main/resources/log4j2.xml           |  39 --
 .../core/receivers/DsmReceiver.scala               |  78 ---
 .../common => linkis-datasource-client}/pom.xml    |  45 +-
 .../datasource/client/AbstractRemoteClient.scala}  |  34 +-
 .../linkis/datasource/client/RemoteClient.scala}   |  20 +-
 .../client/config/DatasourceClientConfig.scala}    |  21 +-
 .../DataSourceClientBuilderException.scala}        |  22 +-
 .../datasource/client/TestDataSourceClient.scala   |   0
 .../common/util/PatternInjectUtils.java            | 209 ++++++
 .../linkis/metadata/receiver/MDQReceiver.scala     |  79 +--
 .../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/MetadataConnection.java         |  58 --
 .../common/service/MetadataDbService.java          |  68 --
 .../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/application.yml      |  44 --
 .../server/src/main/resources/linkis.properties    |  25 -
 .../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 -
 .../src/main/resources/application.yml             |  38 --
 .../src/main/resources/linkis.properties           |  22 -
 .../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 -
 .../jobhistory/restful/api/QueryRestfulApi.java    |  76 ++-
 .../linkis-ps-common-lock/pom.xml                  |   2 +-
 linkis-public-enhancements/pom.xml                 |   2 +-
 .../linkis-gateway-authentication/pom.xml          |   2 +-
 .../linkis-spring-cloud-gateway/pom.xml            |  32 +-
 .../linkis-gateway-datasource-ruler/pom.xml        |   2 +-
 web/src/apps/URM/i18n/common/en.json               |  73 ++
 web/src/apps/URM/i18n/common/zh.json               |  73 ++
 .../module/functionManagement/addFunctionModal.vue | 713 +++++++++++++++++++
 .../apps/URM/module/functionManagement/index.js    |   8 +-
 .../apps/URM/module/functionManagement/index.scss  | 152 +++++
 .../apps/URM/module/functionManagement/index.vue   | 672 ++++++++++++++++++
 .../URM/module/functionManagement/jarPreview.vue   |  35 +-
 .../URM/module/functionManagement/pyPreview.vue    |  35 +-
 .../URM/module/functionManagement/scalaPreview.vue |  41 +-
 .../URM/module/functionManagement/usePreview.vue   |  39 +-
 .../apps/URM/module/functionManagement/vlist.vue   | 281 ++++++++
 .../src/apps/URM/module/header/index.js            |  13 +-
 web/src/apps/URM/module/header/index.scss          | 133 ++++
 web/src/apps/URM/module/header/index.vue           | 130 ++++
 web/src/apps/URM/module/header/userMenu.vue        | 134 ++++
 .../URM/module/udfManagement/addFunctionModal.vue  | 755 +++++++++++++++++++++
 .../src/apps/URM/module/udfManagement/index.js     |   8 +-
 web/src/apps/URM/module/udfManagement/index.scss   | 152 +++++
 web/src/apps/URM/module/udfManagement/index.vue    | 678 ++++++++++++++++++
 .../apps/URM/module/udfManagement/jarPreview.vue   |  35 +-
 .../apps/URM/module/udfManagement/pyPreview.vue    |  35 +-
 .../apps/URM/module/udfManagement/scalaPreview.vue |  41 +-
 .../apps/URM/module/udfManagement/usePreview.vue   |  39 +-
 web/src/apps/URM/module/udfManagement/vlist.vue    | 281 ++++++++
 web/src/apps/URM/router.js                         |  61 ++
 .../src/apps/URM/view/layout.vue                   |  48 +-
 .../{linkis/view/linkis => URM/view/urm}/index.vue |  72 +-
 web/src/apps/linkis/components/cardList/index.vue  |  25 +-
 web/src/apps/linkis/components/tag/index.vue       |  58 +-
 web/src/apps/linkis/i18n/common/en.json            |  34 +-
 web/src/apps/linkis/i18n/common/zh.json            | 105 +--
 web/src/apps/linkis/module/ECM/engineConn.vue      | 216 +++---
 web/src/apps/linkis/module/ECM/index.vue           |  25 +-
 web/src/apps/linkis/module/ECM/log.vue             | 141 ++++
 web/src/apps/linkis/module/ECM/search.vue          |  28 +-
 .../module/globalHistoryManagement/index.vue       | 147 ++--
 .../module/globalHistoryManagement/viewHistory.vue |  81 ++-
 .../linkis/module/microServiceManagement/index.vue |  17 +-
 .../linkis/module/resourceManagement/index.scss    |  17 +-
 .../linkis/module/resourceManagement/index.vue     | 490 ++++++++-----
 web/src/apps/linkis/module/setting/setting.vue     | 127 ++--
 web/src/apps/linkis/view/linkis/index.vue          |  14 +-
 web/src/common/service/execute.js                  |  10 +-
 web/src/common/service/mixin.js                    |  11 +-
 web/src/components/consoleComponent/log.vue        |  25 +-
 web/src/components/consoleComponent/result.vue     |  29 +-
 web/src/components/consoleComponent/toolbar.vue    |  35 +-
 web/src/components/table/table.css                 |   2 +-
 web/src/components/table/table.vue                 |  10 +-
 web/src/components/tree/index.vue                  |  12 +-
 .../virtualTable/historyTable/historyTable.vue     |  55 +-
 .../components/virtualTable/resultTable/header.vue |  19 +-
 web/src/config.json                                |  15 +-
 web/src/dss/module/header/index.vue                | 260 +------
 web/src/dss/view/layout.vue                        |  10 +-
 166 files changed, 6113 insertions(+), 9187 deletions(-)

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org