You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by al...@apache.org on 2022/03/01 11:39:30 UTC

[incubator-linkis] branch dev-1.1.1 updated (5f6b6dc -> aadafea)

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

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


    from 5f6b6dc  Optimize code
     new 3e00c83  Merge code from upstream master branch
     new 0fca285  Fix the issue of JDBC engine execution error:21304, Task is Failed,errorMsg: NullPointerException: #1421 (#1529)
     new fe713a5  set the value of JAVA_ENGINE_REQUEST_INSTANCE is constant 1 (#1535)
     new 2cf9cb7  #close 1538 (#1540)
     new fb54e69  Fix bug: SecurityFilter can't get loginUser for the first time in test mode
     new 522e552  add MessageStatus
     new 30aebb7  add test code for linkis-jobhistory
     new 51af3d7  add license header
     new 9201d5f  add asf header and adjust code format
     new 0044c8f  exclude spring-boot-starter-logging
     new 37e069b  Avoid time zone issues
     new 1de2c91  adjust code style
     new e2d9fee  clear Redundant code for datasource
     new acace79  add datasource and metadata manager to assembly package
     new 4554c8a  add datasource related properties
     new 2b1234e  add datasource statup script
     new 7217ab5  add datasource ddl and dml
     new 390c49f  fix fastxml can't convert
     new f53e04e  fix datasource web visit failure
     new 4ceec6a  add receiver for metadata
     new 90c2549  remove webank flag
     new 84286f1  mvn spotless format
     new b4d45d3  fix code format
     new 0a6c012  rm useless file
     new bbb48bf  add shell for generate konwn-dependencies.txt which contains all third-party jar
     new 05371cc  update the list of third-party jar by running 'sh regenerate_konwn_dependencies_txt.sh'
     new a13650c  the git Actions will check whether there are new third dependencies,compared with file(tool/dependencies/known-dependencies.txt)
     new 43c654c  rename to 'third-party dependencies check'
     new af2f0ca  rename filename
     new 2a369f9  add comment
     new 45fc392  add jar "xml-apis-1.3.04.jar"
     new 91426c7  Merge pull request #1536 from iture123/dev-1.3.0
     new 30d09ba  optimize install.sh script (#1561)
     new dfc18af  optimize of linkis-cli (#1563)
     new 4d0a693  upgrade junit4 to junit5
     new 52e5a0c  code style spotless
     new 7f9542e  adjust junit dependency
     new df42aae  Merge remote-tracking branch 'origin/upgrade-juint5' into optimize_dependency
     new cad98cb  adjust distribution.xml:exclude  unnecessary dependency
     new 36b2460  Merge branch 'optimize_pom' into optimize_dependency
     new 4c66ffc  adjust pom dependency:use spring-cloud-dependencies
     new bff0c40  adjust pom dependency
     new eb54b6e  Merge branch 'optimize_spring' into optimize_dependency
     new 871c112  adjust pom dependency
     new 552c823  eureka disbution.xml
     new f338ffa  restore jersey dependencies
     new 456fd53  remove comments from pom file
     new 7bd7dc4  Merge pull request #1571 from casionone/dev-1.1.0-datasource
     new 1c69508  Merge branch 'master' into dev-1.1.0-datasource
     new ffd1107  Added Ecosystem chapter (#1496) (#1581)
     new 52b8fe7  Merge branch 'apache:dev-1.1.0-datasource' into dev-1.1.0-datasource
     new 6a58e71  Merge pull request #1578 from casionone/dev-1.1.0-datasource
     new 2ab0b6f  Merge pull request #1582 from apache/dev-1.1.0-datasource
     new 1ad95ee  Merge remote-tracking branch 'origin/master' into dev-1.1.1
     new 1aaf692  Merge code from upstream master branch
     new 274982f  Module optimization, remove cs-ec-support module #1580
     new 50dcbe4  Add startup classes for multiple PS modules #1584
     new bda260ee Merge code from upstream master branch
     new db551d0  Merge code from upstream master branch
     new 863ff61  Remove wrong comments
     new 3b9a1a9  reformat code
     new 91b02f3  update assembly version
     new a42fabc  Supplement the license of the newly introduced dependencies
     new 4e88481  update protobuf version
     new dcbad90  add oshi and jna License
     new 7edd987  remove hadoop dependency
     new f8f018b  update protobuf-java version
     new d8e7ffc  add protobuf-java-3.13.0.jar
     new aadafea  Merge pull request #1585 from WeDataSphere/dev-1.1.1-merge

The 2159 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:
 .../workflows/check_third_party_dependencies.yml   |  56 +++
 LICENSE-binary                                     |   3 +
 .../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 -----
 ...es => linkis-ps-data-source-manager.properties} |  27 +-
 .../conf/linkis-ps-metadatamanager.properties      |  12 +-
 .../assembly-combined/conf/linkis.properties       |   9 +-
 .../public-module-combined/pom.xml                 |  12 -
 .../assembly-combined/sbin/ext/linkis-common-start |   2 +
 .../assembly-combined/sbin/ext/linkis-mg-eureka    |  10 +-
 .../assembly-combined/sbin/ext/linkis-mg-gateway   |   3 +
 ...{linkis-ps-cs => linkis-ps-data-source-manager} |  12 +-
 ...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                                  |  44 +-
 db/module/linkis_datasource.sql                    | 127 ++++++
 licenses-binary/LICENSE-jna.txt                    |  26 ++
 .../LICENSE-oshi.txt                               |   4 +-
 linkis-commons/linkis-common/pom.xml               |   5 +
 .../linkis/message/SchedulerMessageTest.java       | 113 +++++
 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              |   6 +-
 .../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               |  53 +--
 .../src/main/assembly/distribution.xml             |  13 +-
 .../linkis-once-engineconn/pom.xml                 |  11 -
 .../linkis-computation-engineconn/pom.xml          |   2 +-
 .../executor/cs}/CSTableResultSetWriter.scala      |  12 +-
 .../executor/execute/EngineExecutionContext.scala  |  12 +-
 .../linkis-entrance/pom.xml                        |  16 +-
 .../src/main/assembly/distribution.xml             |   3 +
 .../entrance/restful/EntranceRestfulApi.java       |   2 +-
 .../entrance/restful/EntranceRestfulRemote.scala   |   2 +-
 .../src/main/assembly/distribution.xml             |  26 +-
 .../linkis-manager-persistence/pom.xml             |  16 -
 .../src/test/java/PersistenceTest.java             |   6 +-
 .../linkis-manager/linkis-resource-manager/pom.xml | 188 --------
 .../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             |  11 +-
 linkis-extensions/linkis-io-file-client/pom.xml    |  29 --
 .../src/main/assembly/distribution.xml             |  42 --
 .../linkis-context-service/linkis-cs-cache/pom.xml |  22 -
 .../test/service/TestContextCacheService.java      |   6 +-
 .../linkis-cs-client/pom.xml                       |  28 +-
 .../linkis/cs/client/test/restful/RestfulTest.java |   2 +-
 .../linkis/cs/client/test/service/TestRemove.java  |   2 +-
 .../linkis-cs-common/pom.xml                       |  22 +-
 .../linkis-cs-engine-support/pom.xml               |  68 ---
 .../linkis-cs-highavailable/pom.xml                |   5 -
 .../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                       |  11 -
 .../src/main/assembly/distribution.xml             |   9 +
 .../linkis-context-service/pom.xml                 |   5 +-
 .../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-publicservice/distribution.xml          | 340 --------------
 .../configuration/LinkisConfigurationApp.java}     |   4 +-
 .../linkis-error-code-server/pom.xml               |  29 --
 .../linkis-instance-label-server/pom.xml           |   5 -
 ...licServiceApp.java => LinkisJobHistoryApp.java} |   2 +-
 .../linkis/jobhistory/dao/JobDetailMapper.java     |   4 +-
 .../java/org/apache/linkis/jobhistory/Scan.java    |  13 +-
 .../linkis/jobhistory/WebApplicationServer.java}   |  29 +-
 .../apache/linkis/jobhistory/dao/BaseDaoTest.java  |  20 +-
 .../linkis/jobhistory/dao/JobDetailMapperTest.java | 130 ++++++
 .../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                  |  29 +-
 .../src/test/resources/linkis.properties           |  11 +-
 .../linkis-ps-common-lock/pom.xml                  |  14 -
 .../linkis-storage-script-dev-server/pom.xml       |   7 -
 .../linkis/filesystem}/LinkisPublicServiceApp.java |   2 +-
 .../linkis-publicservice/pom.xml                   |  30 +-
 linkis-public-enhancements/pom.xml                 |   2 +-
 .../linkis-service-discovery/linkis-eureka/pom.xml |   2 -
 .../src/main/assembly/distribution.xml             | 111 +++++
 .../linkis-gateway-authentication/pom.xml          |  20 +-
 .../gateway/authentication/dao/TokenDaoTest.java   |  51 ---
 .../authentication/dao/utils/MyBatisUtil.java      |  53 ---
 .../service/CachedTokenServiceTest.java            | 110 -----
 .../src/test/resources/TokenMapper.xml             |  53 ---
 .../src/test/resources/conf/mybatis-config.xml     |  39 --
 .../src/test/resources/conf/run_first_for_test.sql |  34 --
 .../linkis-gateway-core/pom.xml                    |   1 -
 .../linkis-gateway-server-support/pom.xml          |   3 -
 .../linkis-spring-cloud-gateway/pom.xml            |  30 --
 pom.xml                                            | 121 ++++-
 tool/dependencies/diff-dependenies.sh              |  38 --
 tool/dependencies/known-dependencies.txt           | 502 ++++++++++++---------
 .../regenerate_konwn_dependencies_txt.sh           |  19 +-
 tool/dependencies/third-party-dependencies.txt     | 437 ------------------
 web/install.sh                                     |   2 +-
 web/src/apps/URM/module/udfManagement/index.js     |  21 -
 136 files changed, 2155 insertions(+), 2604 deletions(-)
 create mode 100644 .github/workflows/check_third_party_dependencies.yml
 delete mode 100644 assembly-combined-package/assembly-combined/bin/linkis-cli-start
 copy assembly-combined-package/assembly-combined/conf/{linkis-cg-linkismanager.properties => linkis-ps-data-source-manager.properties} (56%)
 copy linkis-engineconn-plugins/engineconn-plugins/shell/src/main/resources/conf/linkis-engineconn.properties => assembly-combined-package/assembly-combined/conf/linkis-ps-metadatamanager.properties (75%)
 copy assembly-combined-package/assembly-combined/sbin/ext/{linkis-ps-cs => linkis-ps-data-source-manager} (81%)
 copy assembly-combined-package/assembly-combined/sbin/ext/{linkis-common-start => linkis-ps-metadatamanager} (69%)
 create mode 100644 db/module/linkis_datasource.sql
 create mode 100644 licenses-binary/LICENSE-jna.txt
 copy licenses-binary-ui/LICENSE-eslint-plugin-vue.txt => licenses-binary/LICENSE-oshi.txt (90%)
 create mode 100644 linkis-commons/linkis-message-scheduler/src/test/java/org/apache/linkis/message/SchedulerMessageTest.java
 rename {linkis-public-enhancements/linkis-context-service/linkis-cs-engine-support/src/main/scala/org/apache/linkis/cs/storage => linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/cs}/CSTableResultSetWriter.scala (97%)
 delete mode 100644 linkis-extensions/linkis-io-file-client/src/main/assembly/distribution.xml
 delete mode 100644 linkis-public-enhancements/linkis-context-service/linkis-cs-engine-support/pom.xml
 create mode 100644 linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/scala/org/apache/linkis/metadatamanager/server/receiver/BaseMetaReceiver.scala
 delete mode 100644 linkis-public-enhancements/linkis-publicservice/distribution.xml
 copy linkis-public-enhancements/{linkis-datasource/linkis-metadata/src/main/java/org/apache/linkis/metadata/LinkisDataSourceApplication.java => linkis-publicservice/linkis-configuration/src/main/java/org/apache/linkis/configuration/LinkisConfigurationApp.java} (92%)
 copy linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/{LinkisPublicServiceApp.java => LinkisJobHistoryApp.java} (96%)
 copy linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/service/OperateService.scala => linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/test/java/org/apache/linkis/jobhistory/Scan.java (76%)
 copy linkis-public-enhancements/{linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/server/Scan.java => linkis-publicservice/linkis-jobhistory/src/test/java/org/apache/linkis/jobhistory/WebApplicationServer.java} (56%)
 copy linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/once/result/ECMOperateResult.scala => linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/test/java/org/apache/linkis/jobhistory/dao/BaseDaoTest.java (62%)
 create mode 100644 linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/test/java/org/apache/linkis/jobhistory/dao/JobDetailMapperTest.java
 create mode 100644 linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/test/java/org/apache/linkis/jobhistory/entity/JobHistoryTest.java
 create mode 100644 linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/test/java/org/apache/linkis/jobhistory/restful/api/QueryRestfulApiTest.java
 create mode 100644 linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/test/java/org/apache/linkis/jobhistory/service/JobHistoryDetailQueryServiceTest.java
 create mode 100644 linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/test/resources/application.properties
 copy linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/once/result/ECMOperateResult.scala => linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/test/resources/create.sql (62%)
 copy assembly-combined-package/assembly-combined/conf/token.properties => linkis-public-enhancements/linkis-publicservice/linkis-jobhistory/src/test/resources/linkis.properties (87%)
 rename linkis-public-enhancements/linkis-publicservice/{linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory => linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem}/LinkisPublicServiceApp.java (96%)
 delete mode 100644 linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-authentication/src/test/java/org/apache/linkis/gateway/authentication/dao/TokenDaoTest.java
 delete mode 100644 linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-authentication/src/test/java/org/apache/linkis/gateway/authentication/dao/utils/MyBatisUtil.java
 delete mode 100644 linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-authentication/src/test/java/org/apache/linkis/gateway/authentication/service/CachedTokenServiceTest.java
 delete mode 100644 linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-authentication/src/test/resources/TokenMapper.xml
 delete mode 100644 linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-authentication/src/test/resources/conf/mybatis-config.xml
 delete mode 100644 linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-authentication/src/test/resources/conf/run_first_for_test.sql
 delete mode 100644 tool/dependencies/diff-dependenies.sh
 copy .github/ISSUE_TEMPLATE/config.yml => tool/dependencies/regenerate_konwn_dependencies_txt.sh (61%)
 mode change 100644 => 100755
 delete mode 100644 tool/dependencies/third-party-dependencies.txt
 delete mode 100644 web/src/apps/URM/module/udfManagement/index.js

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