This is an automated email from the ASF dual-hosted git repository. peacewong pushed a commit to branch dev-1.3.2 in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit 97cf7e5fb7a4ff210b7563787722d6596559255b Merge: 24d00b821 71ecd19fb Author: peacewong <[email protected]> AuthorDate: Mon Nov 21 10:40:37 2022 +0800 Merge 1.3.1 to 1.3.2 Merge 1.3.1 to 1.3.2 .../apache/linkis/restful/CommonRestfulApi.java | 16 +- .../org/apache/linkis/scheduler/queue/Job.scala | 2 +- .../AbstractCodeLanguageLabelExecutorFactory.scala | 5 +- .../core/engineconn/EngineConnManager.scala | 2 +- .../engineconn/core/executor/ExecutorManager.scala | 5 +- .../server/restful/EnginePluginRestful.java | 447 ++--- .../entrance/restful/EntranceLabelRestfulApi.java | 72 +- .../entrance/restful/EntranceMetricRestfulApi.java | 151 +- .../entrance/restful/EntranceRestfulApi.java | 1195 +++++++------ .../apache/linkis/entrance/EntranceServer.scala | 5 +- .../entrance/execute/EntranceExecutorManager.scala | 8 +- .../am/restful/ECResourceInfoRestfulApi.java | 239 ++- .../linkis/manager/am/restful/EMRestfulApi.java | 596 ++++--- .../manager/am/restful/EngineRestfulApi.java | 609 ++++--- linkis-dist/package/db/linkis_dml.sql | 193 ++- .../db/upgrade/1.3.1_schema/mysql/linkis_dml.sql | 31 +- .../spark/cs/CSSparkPreExecutionHook.scala | 10 +- .../spark/datacalc/TestDataCalcPlugins.scala | 3 +- linkis-public-enhancements/distribution.xml | 13 + .../server/restful/DatasourceAccessRestfulApi.java | 151 +- .../server/restful/DatasourceEnvRestfulApi.java | 130 +- .../server/restful/DatasourceTypeRestfulApi.java | 139 +- .../server/restful/ErrorCodeRestfulApi.java | 129 +- .../server/restful/GatewayAuthTokenRestfulApi.java | 150 +- .../RmExternalResourceProviderRestfulApi.java | 144 +- .../server/restful/UdfManagerRestfulApi.java | 135 +- .../server/restful/UdfTreeRestfulApi.java | 127 +- .../linkis/bml/restful/BmlProjectRestful.java | 762 ++++---- .../apache/linkis/bml/restful/BmlRestfulApi.java | 1713 +++++++++--------- .../restful/api/ConfigurationRestfulApi.java | 711 ++++---- .../restful/api/TenantConfigrationRestfulApi.java | 369 ++-- .../restful/api/UserIpConfigrationRestfulApi.java | 320 ++-- .../server/restful/ContextHistoryRestfulApi.java | 229 +-- .../cs/server/restful/ContextIDRestfulApi.java | 370 ++-- .../server/restful/ContextListenerRestfulApi.java | 99 +- .../cs/server/restful/ContextRestfulApi.java | 564 +++--- .../datasourcemanager/common/auth/AuthContext.java | 15 - .../core/restful/DataSourceAdminRestfulApi.java | 634 +++---- .../core/restful/DataSourceCoreRestfulApi.java | 1437 +++++++-------- .../core/restful/DataSourceOperateRestfulApi.java | 151 +- .../restful/DataSourceAdminRestfulApiTest.java | 47 +- .../core/restful/DataSourceCoreRestfulApiTest.java | 99 +- .../query/server/restful/MetadataCoreRestful.java | 582 +++---- .../query/server/restful/MetadataQueryRestful.java | 728 ++++---- .../server/restful/MetadataCoreRestfulTest.java | 85 +- .../server/restful/MetadataQueryRestfulTest.java | 71 +- .../metadata/restful/api/DataSourceRestfulApi.java | 262 +-- .../metadata/restful/api/MdqTableRestfulApi.java | 378 ++-- .../server/restful/LinkisErrorCodeRestful.java | 24 +- .../instance/label/restful/InstanceRestful.java | 190 +- .../jobhistory/restful/api/QueryRestfulApi.java | 642 ++++--- .../filesystem/restful/api/BMLFsRestfulApi.java | 277 +-- .../filesystem/restful/api/FsRestfulApi.java | 1832 ++++++++++---------- .../linkis/filesystem/utils/UserGroupInfo.scala | 4 +- .../variable/restful/api/VariableRestfulApi.java | 88 +- linkis-web/src/apps/linkis/i18n/common/en.json | 23 + linkis-web/src/apps/linkis/i18n/common/zh.json | 3 +- .../linkis/module/EnginePluginManagement/index.vue | 10 + linkis-web/src/apps/linkis/view/linkis/index.vue | 6 +- pom.xml | 5 - 60 files changed, 9014 insertions(+), 8423 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
