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/08/19 10:19:19 UTC

[incubator-linkis] 01/01: Merge 1.2.0 into master

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 56f23ccfbe35785977cd13fd310e1421914cf667
Merge: 123a297c7 40b6e2079
Author: peacewong <wp...@gmail.com>
AuthorDate: Fri Aug 19 18:19:08 2022 +0800

    Merge 1.2.0  into master
    
    Merge dev-1.2.0  into master

 .github/workflows/auto-comment.yml                 | 16 +++++
 .github/workflows/dead-link-checker.yaml           | 16 +++++
 README.md                                          |  8 +--
 README_CN.md                                       | 10 +--
 .../apache/linkis/common/conf/Configuration.scala  |  2 +-
 .../apache/linkis/storage/utils/StorageUtils.scala |  9 ++-
 .../linkis/manager/rm/restful/RMMonitorRest.scala  | 48 +++++++------
 .../manager/label/conf/LabelCommonConfig.java      |  3 +
 .../label/utils/EngineTypeLabelCreator.java        |  4 ++
 linkis-dist/package/db/linkis_ddl.sql              |  2 +
 linkis-dist/package/db/linkis_dml.sql              |  5 +-
 .../db/upgrade/1.2.0_schema/mysql/linkis_ddl.sql   |  4 +-
 .../db/upgrade/1.2.0_schema/mysql/linkis_dml.sql   | 84 ++++++++++++++++++++++
 .../conf/ElasticSearchConfiguration.scala          |  2 +-
 .../conf/ElasticSearchEngineConsoleConf.scala      | 39 ++++++++++
 .../executer/ElasticSearchEngineConnExecutor.scala | 36 ++++++++--
 .../executer/client/ElasticSearchExecutor.scala    | 16 ++---
 .../elasticsearch/executer/client/EsClient.scala   |  9 +--
 .../executer/client/EsClientFactory.scala          | 20 +++---
 .../client/impl/ElasticSearchExecutorImpl.scala    |  4 +-
 .../hive/src/main/resources/log4j2.xml             |  4 +-
 .../jdbc/exception/JDBCDatasourceException.scala   | 18 +++--
 .../jdbc/executer/JDBCEngineConnExecutor.scala     | 24 +++++--
 .../jdbc/executer/JDBCMultiDatasourceParser.scala  | 16 ++---
 .../datasource/client/DataSourceRemoteClient.scala |  7 ++
 .../client/impl/LinkisDataSourceRemoteClient.scala | 10 ++-
 .../GetInfoPublishedByDataSourceNameAction.scala   | 77 ++++++++++++++++++++
 .../GetInfoPublishedByDataSourceNameResult.scala   | 35 +++++++++
 .../datasource/client/TestDataSourceClient.scala   | 33 +++++++--
 .../core/restful/DataSourceCoreRestfulApi.java     | 33 +++++++++
 .../core/service/DataSourceInfoService.java        |  9 +++
 .../service/impl/DataSourceInfoServiceImpl.java    | 80 ++++++++-------------
 .../src/apps/URM/module/udfManagement/index.vue    | 22 +++---
 33 files changed, 547 insertions(+), 158 deletions(-)


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