You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by ca...@apache.org on 2023/04/04 07:51:17 UTC

[linkis] 01/01: Merge pull request #4433 from apache/release-1.3.2-RC1

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

casion pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/linkis.git

commit 8ad945e153164d36683ad24fc31865db243916d8
Merge: 503f72d92 cf0a16daa
Author: Casion <ca...@gmail.com>
AuthorDate: Tue Apr 4 15:51:06 2023 +0800

    Merge pull request #4433 from apache/release-1.3.2-RC1
    
    Release 1.3.2

 .github/workflows/build-backend.yml                |  58 ++-
 .../workflows/check-third-party-dependencies.yml   |  56 ---
 .github/workflows/publish-docker.yaml              |   4 +-
 .mvn/wrapper/MavenWrapperDownloader.java           | 117 -----
 .mvn/wrapper/maven-wrapper.properties              |   5 +-
 LICENSE                                            |   1 +
 README.md                                          |  47 +-
 README_CN.md                                       |  61 ++-
 .../linkis-engineconn-manager-server.md            |   1 +
 docs/configuration/linkis-entrance.md              |   2 +-
 .../linkis-engineconn-plugin-core-errorcode.md     |   2 +
 docs/errorcode/linkis-rpc-errorcode.md             |  14 +-
 docs/info-1.3.2.md                                 |   3 +-
 .../apache/linkis/common/utils/SecurityUtils.java  | 197 ++++++--
 .../apache/linkis/common/conf/Configuration.scala  |  10 +
 .../apache/linkis/common/utils/HardwareUtils.scala |   5 +
 .../org/apache/linkis/common/utils/Utils.scala     |  21 +
 .../org/apache/linkis/common/utils/ZipUtils.scala  |  18 +-
 .../linkis/common/utils/SecurityUtilsTest.java     | 338 ++++++++++----
 .../linkis/common/utils/HardwareUtilsTest.scala    |   5 +
 .../httpclient/config/ClientConfigBuilder.scala    |   9 +-
 .../apache/linkis/DataWorkCloudApplication.java    |  10 +-
 .../linkis/server/security/SecurityFilter.scala    |   6 +-
 .../linkis/protocol/constants/TaskConstant.java    |  25 +-
 .../rpc/errorcode/LinkisRpcErrorCodeSummary.java   |   4 +-
 .../org/apache/linkis/rpc/AsynRPCMessageBus.scala  |   6 +-
 .../scala/org/apache/linkis/rpc/RPCMapCache.scala  |   1 -
 .../main/scala/org/apache/linkis/rpc/Sender.scala  |  24 +-
 .../apache/linkis/rpc/conf/RPCConfiguration.scala  |   4 +
 .../linkis/rpc/errorcode/RPCErrorConstants.scala   |  24 -
 .../apache/linkis/rpc/transform/RPCProduct.scala   |   7 +-
 .../rpc/errorcode/RPCErrorConstantsTest.scala      |  38 --
 .../linkis/storage/csv/StorageCSVWriter.scala      |   5 +-
 .../linkis/storage/excel/StorageExcelWriter.scala  |  26 +-
 .../linkis/storage/script/ScriptFsWriter.scala     |   4 +
 .../script/compaction/CommonScriptCompaction.scala |   2 +
 .../storage/script/parser/CommonScriptParser.scala |   2 +
 .../script/reader/StorageScriptFsReader.scala      |  25 +-
 .../script/writer/StorageScriptFsWriter.scala      |  34 +-
 .../apache/linkis/storage/source/FileSplit.scala   |  23 +-
 .../script/writer/StorageScriptFsWriterTest.java   | 151 ++++++
 .../src/test/resources/scritpis-test.sql           |  10 +
 .../operator/ujes/UJESClientFactory.java           |   6 +-
 .../application/LinkisClientApplicationTest.java   |   6 +-
 .../computation/client/LinkisJobBuilder.scala      |   8 +-
 .../computation/client/SeatunnelOnceJobTest.java   |   4 +-
 .../computation/client/SparkOnceJobTest.java       | 184 ++++++--
 .../linkis/ujes/client/JobObserveActionTest.scala  |   7 +-
 .../common/conf/GovernaceCommonConf.scala          |   2 +
 .../common/constant/ec/ECConstants.scala           |  21 +-
 .../protocol/conf/EntranceInstanceConf.scala       |  12 +-
 .../apache/linkis/ecm/scheduled/EcmClearTask.java  |  65 +++
 .../linkis/ecm/server/conf/ECMConfiguration.scala  |   3 +
 .../service/impl/DefaultECMHealthService.scala     |  12 +-
 .../service/impl/DefaultECMRegisterService.scala   |   3 +-
 .../service/impl/DefaultEngineConnKillService.java |   2 +-
 .../impl/DefaultEngineConnListService.scala        |   4 +-
 .../apache/linkis/ecm/server/util/ECMUtils.scala   |  41 +-
 .../executor/conf/ComputationExecutorConf.scala    |  90 +++-
 .../executor/execute/ComputationExecutor.scala     |   6 +
 .../metrics/ComputationEngineConnMetrics.scala     |  94 ++++
 .../service/DefaultNodeHeartbeatMsgManager.scala   |  85 ++++
 .../service/TaskExecutionServiceImpl.scala         |  14 +-
 .../engineconn/launch/EngineConnServer.scala       |   4 +-
 .../executor/info/NodeHeartbeatMsgManager.scala    |   4 +-
 .../service/DefaultAccessibleService.scala         |  11 +-
 .../service/DefaultExecutorHeartbeatService.scala  |   2 +-
 .../errorcode/EngineconnCoreErrorCodeSummary.java  |   9 +-
 .../common/conf/EnvConfiguration.scala             |  11 +-
 .../JavaProcessEngineConnLaunchBuilder.scala       |  19 +-
 .../common/util/NodeResourceUtils.scala            |  41 +-
 .../linkis/entrance/job/EntranceExecutionJob.java  |  88 ++--
 .../persistence/QueryPersistenceEngine.java        |   2 +-
 .../entrance/restful/EntranceRestfulApi.java       |  51 +-
 .../entrance/server/DefaultEntranceServer.java     |  14 +
 .../entrance/cli/heartbeat/KillHandler.scala       |   4 +-
 .../entrance/conf/EntranceConfiguration.scala      |  12 +-
 .../entrance/execute/DefaultEntranceExecutor.scala |   5 +-
 .../linkis/entrance/execute/EntranceJob.scala      |  10 +-
 .../impl/ParserVarLabelInterceptor.scala           |   3 +-
 .../interceptor/impl/TenantLabelSetUtils.scala     |   2 +-
 .../interceptor/impl/UserCreatorIPCheckUtils.scala |   2 +-
 .../linkis/entrance/log/HDFSCacheLogWriter.scala   |   6 +-
 .../entrance/parser/CommonEntranceParser.scala     |   7 +-
 .../linkis/entrance/utils/JobHistoryHelper.scala   |  33 +-
 .../loaders/DefaultEngineConnPluginLoader.java     |   2 +
 .../service/impl/EnginePluginAdminServiceImpl.java |   1 -
 .../linkis/manager/rm/exception/RMErrorCode.java   |  19 +-
 .../conf/EngineConnPluginConfiguration.scala       |   4 +
 .../AbstractEngineConnBmlResourceGenerator.scala   |  49 +-
 .../DefaultEngineConnBmlResourceGenerator.scala    |  18 +-
 .../service/DefaultEngineConnResourceService.scala |  28 +-
 .../linkis/manager/am/conf/AMConfiguration.scala   |   3 +
 .../am/selector/rule/HotspotExclusionRule.scala    |  70 +++
 .../am/service/em/DefaultEMEngineService.scala     |   1 -
 .../engine/DefaultEngineAskEngineService.scala     |   2 +-
 .../engine/DefaultEngineCreateService.scala        |  40 +-
 .../service/engine/DefaultEngineReuseService.scala |  29 +-
 .../rm/service/impl/DefaultResourceManager.scala   |  30 +-
 .../rm/service/impl/ResourceLogService.scala       |   6 +-
 .../selector/rule/HotspotExclusionRuleTest.scala   |  76 +++
 .../manager/label/constant/LabelKeyConstant.java   |   2 +
 .../label/entity/engine/FixedEngineConnLabel.java  |  70 +++
 .../label/entity/entrance/ExecuteOnceLabel.java    |   3 +-
 .../errorcode/LabelCommonErrorCodeSummary.java     |  17 +-
 .../label/entity/engine/EngineTypeLabelTest.java   |   5 +-
 .../entity/persistence/ECResourceInfoRecord.java   |  10 +
 .../common/protocol/engine/EngineReuseRequest.java |  10 +
 .../manager/common/entity/resource/Resource.scala  |  10 +-
 .../mapper/common/ECResourceRecordMapper.xml       |   5 +-
 linkis-dist/bin/common.sh                          |   6 +-
 linkis-dist/bin/install.sh                         |  21 +
 linkis-dist/deploy-config/linkis-env.sh            |   2 +-
 linkis-dist/helm/README.md                         |   4 +-
 linkis-dist/helm/README_CN.md                      |   4 +-
 linkis-dist/helm/charts/linkis/Chart.yaml          |   2 +-
 .../linkis/templates/configmap-linkis-config.yaml  |  42 +-
 .../linkis/templates/linkis-cg-engineplugin.yaml   | 223 ---------
 linkis-dist/package/admin/linkis-ec-clear.sh       |  40 ++
 linkis-dist/package/conf/linkis.properties         |  15 +-
 linkis-dist/package/conf/log4j2.xml                |   8 +-
 linkis-dist/package/db/linkis_ddl.sql              |   7 +
 linkis-dist/package/db/linkis_dml.sql              |  72 +--
 .../db/upgrade/1.3.2_schema/mysql/linkis_dml.sql   |  22 +-
 linkis-dist/pom.xml                                |   5 +
 .../src/main/assembly/distribution.xml             |   4 +-
 linkis-engineconn-plugins/flink/pom.xml            |  10 +-
 .../flink/src/main/assembly/distribution.xml       |   4 +-
 linkis-engineconn-plugins/hive/pom.xml             |   4 -
 .../hive/src/main/assembly/distribution.xml        |   4 +-
 .../hive/serde/CustomerDelimitedJSONSerDe.java     |  50 +-
 .../main/resources/linkis-engineconn.properties    |   8 +-
 .../hive/src/main/resources/log4j2.xml             |   2 +-
 .../hive/conf/HiveEngineConfiguration.scala        |   6 +-
 .../hive/executor/HiveEngineConnExecutor.scala     |  76 +--
 .../io_file/src/main/assembly/distribution.xml     |   4 +-
 .../jdbc/src/main/assembly/distribution.xml        |   4 +-
 .../engineplugin/jdbc/ConnectionManager.java       |  13 +-
 .../engineplugin/jdbc/utils/JdbcParamUtils.java    |  39 --
 .../jdbc/utils/JdbcParamUtilsTest.java             |  56 ---
 .../openlookeng/src/main/assembly/distribution.xml |   4 +-
 .../executor/OpenLooKengEngineConnExecutor.java    |  20 +-
 linkis-engineconn-plugins/pipeline/pom.xml         |   9 +
 .../pipeline/src/main/assembly/distribution.xml    |   4 +-
 .../presto/src/main/assembly/distribution.xml      |   4 +-
 linkis-engineconn-plugins/python/pom.xml           |   9 +
 .../python/src/main/assembly/distribution.xml      |   6 +-
 .../python/src/main/resources/python/python.py     |  16 +-
 .../python/executor/PythonSession.scala            |   2 +-
 .../seatunnel/src/main/assembly/distribution.xml   |   4 +-
 linkis-engineconn-plugins/shell/pom.xml            |   9 +
 .../shell/src/main/assembly/distribution.xml       |   6 +-
 .../resources/conf/linkis-engineconn.properties    |   4 +-
 .../ShellEngineConnConcurrentExecutor.scala        |  30 +-
 linkis-engineconn-plugins/spark/pom.xml            |  19 +
 .../spark/src/main/assembly/distribution.xml       |   4 +-
 .../deployment/ClusterDescriptorAdapter.java       |  16 +-
 .../YarnApplicationClusterDescriptorAdapter.java   |  62 ++-
 .../spark/src/main/resources/python/mix_pyspark.py |   8 +-
 .../spark/config/SparkConfiguration.scala          |  10 +-
 .../spark/datacalc/sink/HiveSink.scala             |  17 +-
 .../spark/datacalc/sink/JdbcSink.scala             |  16 +-
 .../spark/executor/SparkOnceExecutor.scala         |  71 +--
 .../spark/executor/SparkPythonExecutor.scala       |  35 +-
 .../spark/executor/SparkSubmitOnceExecutor.scala   |   4 +
 .../engineplugin/spark/imexport/CsvRelation.scala  |   8 +-
 .../engineplugin/spark/imexport/ExportData.scala   |  16 +-
 .../spark/launcher/CustomSparkSubmitLauncher.scala |  23 +-
 .../sqoop/src/main/assembly/distribution.xml       |   4 +-
 .../trino/src/main/assembly/distribution.xml       |   4 +-
 .../physical/CodeLogicalUnitExecTask.scala         |  15 +-
 .../orchestrator/core/AbstractOrchestration.scala  |  11 +-
 .../execution/impl/AbstractExecutionFactory.scala  |   1 -
 .../execution/impl/ExecutionImpl.scala             |   8 +-
 .../extensions/operation/CancelOperation.scala     |  11 +-
 .../listener/task/OrchestrationKillListener.scala  |   4 +-
 .../orchestrator/listener/task/TaskInfoEvent.scala |   2 +-
 .../linkis/cs/client/utils/ContextClientConf.scala |   6 +-
 .../cs/client/utils/ContextClientConfTest.java     |   4 -
 .../entity/source/CombinedNodeIDContextID.java     |  16 +
 .../cs/common/entity/source/CommonHAContextID.java |   9 +
 .../cs/common/entity/source/HAContextID.java       |   2 +
 .../entity/source/LinkisHAWorkFlowContextID.java   |  15 +
 .../contextcache/DefaultContextCacheService.java   |  67 ++-
 .../cs/contextcache/cache/DefaultContextCache.java |  13 +-
 .../cache/csid/impl/ContextIDValueImpl.java        |  43 +-
 .../cs/contextcache/metric/ContextIDMetric.java    |   1 +
 .../errorcode/LinkisCsServerErrorCodeSummary.java  |   6 +-
 .../cs/highavailable/DefaultContextHAManager.java  |   6 +-
 .../highavailable/proxy/MethodInterceptorImpl.java | 170 +++----
 .../persistence/entity/PersistenceContextID.java   |  18 +
 .../server/restful/ContextHistoryRestfulApi.java   |  98 ++--
 .../cs/server/restful/ContextIDRestfulApi.java     |  96 ++--
 .../server/restful/ContextListenerRestfulApi.java  |  42 +-
 .../cs/server/restful/ContextRestfulApi.java       | 160 ++++---
 .../linkis/cs/server/restful/CsRestfulParent.java  |  55 +--
 .../server/service/impl/ContextIDServiceImpl.java  |   6 +-
 .../cs/server/service/impl/ContextServiceImpl.java | 110 ++---
 .../LinkisCsServerErrorCodeSummaryTest.java        |   4 -
 .../cs/highavailable/test/haid/TestHAID.java       |   5 +
 .../apache/linkis/cs/persistence/AContextID.java   |   5 +
 .../linkis/cs/server/ContextHistoryRestfulApi.java | 136 ------
 .../linkis/cs/server/ContextIDRestfulApi.java      | 124 -----
 .../cs/server/ContextListenerRestfulApi.java       |  78 ----
 .../apache/linkis/cs/server/ContextRestfulApi.java | 208 ---------
 .../linkis-datasource-manager/common/pom.xml       |   9 -
 .../common/domain/DataSource.java                  |   8 +-
 .../common/domain/DataSourceEnv.java               |   7 +-
 .../common/protocol/DsInfoQueryRequest.java        | 123 +++++
 .../common/protocol/DsInfoResponse.java            | 148 ++++++
 .../datasourcemanager/common/util/CryptoUtils.java |   7 +-
 .../common/protocol/DsmQueryProtocol.scala         |  53 ---
 .../linkis-datasource-manager/server/pom.xml       |   5 -
 .../core/receivers/DsmReceiver.java                | 119 +++++
 .../core/restful/DataSourceCoreRestfulApi.java     |  93 ++--
 .../core/restful/DataSourceOperateRestfulApi.java  |   2 +-
 .../core/restful/RestfulApiHelper.java             |  10 +-
 .../core/service/DataSourceInfoService.java        |   2 +-
 .../service/impl/MetadataOperateServiceImpl.java   |   4 +-
 .../core/receivers/DsmReceiver.scala               | 130 ------
 .../restful/DataSourceAdminRestfulApiTest.java     |   4 +-
 .../core/restful/DataSourceCoreRestfulApiTest.java |   9 +-
 .../core/service/DataSourceInfoServiceTest.java    |  16 +-
 .../core/service/MetadataOperateServiceTest.java   |   3 +-
 .../src/test/resources/application.properties      |   3 +-
 .../common/protocol/MetadataOperateProtocol.scala  |   2 +-
 .../server/src/main/assembly/distribution.xml      |  11 +
 .../service/impl/MetadataQueryServiceImpl.java     | 126 ++---
 .../metadata/query/server/utils/MetadataUtils.java |   2 +-
 .../metadata/query/service/HdfsMetaService.java    |   1 +
 .../linkis-metadata-query/service/hive/pom.xml     |   2 -
 .../metadata/query/service/HiveMetaService.java    |   7 +-
 .../query/service/mysql/SqlConnection.java         |  42 +-
 .../linkis-metadata-query/service/mongodb/pom.xml  |   2 +-
 .../linkis/jobhistory/dao/JobHistoryMapper.java    |   3 +
 .../errorcode/JobhistoryErrorCodeSummary.java}     |  10 +-
 .../jobhistory/restful/api/QueryRestfulApi.java    |   5 +-
 .../resources/mapper/common/JobHistoryMapper.xml   |  12 +-
 .../jobhistory/conversions/TaskConversions.scala   |  29 +-
 .../jobhistory/service/JobHistoryQueryService.java |   4 +
 .../service/impl/JobHistoryQueryServiceImpl.scala  |  37 +-
 .../filesystem/restful/api/FsRestfulApi.java       |  21 +-
 .../linkis/filesystem/util/WorkspaceUtil.java      |  10 +-
 .../filesystem/validator/PathValidator.scala       |   5 +-
 .../java/org/apache/linkis/udf/dao/UDFDao.java     |   4 +-
 .../org/apache/linkis/udf/service/UDFService.java  |   2 +-
 .../linkis/udf/service/impl/UDFServiceImpl.java    |  13 +-
 .../src/main/resources/mapper/common/UDFDao.xml    |  30 +-
 .../apache/linkis/udf/api/rpc/UdfReceiver.scala    |   3 +-
 .../linkis-service-discovery/linkis-eureka/pom.xml |   6 +-
 .../gateway/authentication/dao/TokenDaoTest.java   |   5 +-
 .../service/CachedTokenServiceTest.java            |   4 +-
 .../gateway/config/GatewayConfiguration.scala      |   2 +
 .../linkis/gateway/parser}/RouteLabelParser.scala  |   2 +-
 .../linkis/gateway/security/UserRestful.scala      |  15 +
 .../security/token/TokenAuthentication.scala       |  12 +-
 .../linkis-gateway-server-support/pom.xml          |  16 +-
 .../src/main/assembly/distribution.xml             |   5 -
 .../dss/parser/DSSGatewayConfiguration.scala       |  18 +-
 .../gateway/dss/parser/DSSGatewayParser.scala      | 258 ++++++++++
 .../gateway/dss/parser/DSSRouteLabelParser.scala   |  27 +-
 .../parser/EntranceExecutionGatewayParser.scala    |   3 +-
 .../ujes/route/DefaultLabelGatewayRouter.scala     |   2 +-
 .../ujes/route/GatewayRouterConfiguration.scala    |   2 +-
 .../websocket/WebsocketGatewaySession.scala        |   6 +-
 linkis-spring-cloud-services/pom.xml               |   1 -
 linkis-web/.env                                    |   2 +-
 linkis-web/package.json                            |   5 +-
 .../module/functionManagement/addFunctionModal.vue |   4 +-
 .../apps/URM/module/functionManagement/index.vue   |  24 +-
 .../URM/module/udfManagement/addFunctionModal.vue  |   9 +-
 .../src/apps/URM/module/udfManagement/index.vue    |  24 +-
 .../src/apps/linkis/components/cardList/index.vue  |  30 +-
 linkis-web/src/apps/linkis/i18n/common/en.json     |  31 +-
 linkis-web/src/apps/linkis/i18n/common/zh.json     |  21 +-
 .../src/apps/linkis/module/ECM/engineConn.vue      |  45 +-
 linkis-web/src/apps/linkis/module/ECM/index.vue    |  16 +-
 .../linkis/module/EnginePluginManagement/index.vue |  42 +-
 .../src/apps/linkis/module/datasource/index.vue    |   6 +-
 .../apps/linkis/module/datasourceAccess/index.vue  |   4 +-
 .../linkis/module/datasourceEnv/EditForm/index.vue |  11 +-
 .../src/apps/linkis/module/datasourceEnv/index.vue |   6 +-
 .../apps/linkis/module/gatewayAuthToken/index.vue  |  20 +-
 .../module/globalHistoryManagement/index.vue       |  54 ++-
 .../module/globalHistoryManagement/viewHistory.vue |   9 +-
 .../apps/linkis/module/ipListManagement/index.vue  |   4 +-
 .../linkis/module/microServiceManagement/index.vue |   1 +
 .../module/resourceManagement/engineConn.vue       |   3 +-
 .../linkis/module/resourceManagement/index.vue     |   2 +-
 .../rmExternalResourceProvider/EditForm/index.vue  |   2 +-
 .../src/apps/linkis/module/setting/setting.vue     | 161 ++++++-
 .../linkis/module/tenantTagManagement/index.vue    |   6 +-
 linkis-web/src/apps/linkis/router.js               |  11 +
 linkis-web/src/apps/linkis/view/linkis/index.vue   | 520 ++++++++++++++-------
 linkis-web/src/common/i18n/en.json                 |  11 +-
 linkis-web/src/common/i18n/zh.json                 |  11 +-
 linkis-web/src/common/service/api.js               |  65 ++-
 .../src/components/consoleComponent/result.vue     |   4 +-
 .../src/components/consoleComponent/toolbar.vue    |  38 +-
 .../components/consoleComponent/visualAnalysis.vue |   1 +
 linkis-web/src/dss/view/logPage/index.vue          |   8 +-
 linkis-web/src/dss/view/login/index.vue            |   2 +-
 mvnw                                               | 224 +++++----
 mvnw.cmd                                           |  57 ++-
 pom.xml                                            |  10 +-
 tool/dependencies/known-dependencies.txt           |  26 +-
 .../regenerate_konwn_dependencies_txt.sh           |   4 +-
 307 files changed, 5271 insertions(+), 3465 deletions(-)


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