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/linkis.git
commit f499e454fcc2210339c9dd581d4106b426c95223 Merge: 6fc3ed57d 539693825 Author: peacewong <[email protected]> AuthorDate: Tue Jan 17 15:51:02 2023 +0800 Add new api and fix spark collect_set result Add new api and fix spark collect_set result docs/info-1.3.2.md | 8 ++ .../apache/linkis/common/conf/Configuration.scala | 39 ++++-- .../linkis/common/conf/ConfigurationTest.scala | 3 +- .../linkis/server/utils/ModuleUserUtils.java | 21 ++++ .../persistence/QueryPersistenceEngine.java | 17 ++- .../EntranceUserParallelOrchestratorPlugin.scala | 10 +- .../am/restful/ECResourceInfoRestfulApi.java | 88 ++++++++++++++ .../linkis/manager/am/restful/EMRestfulApi.java | 67 +++++++++-- .../manager/am/restful/EngineRestfulApi.java | 131 ++++++++++++++++----- .../manager/am/service/ECResourceInfoService.java | 11 +- .../am/service/impl/ECResourceInfoServiceImpl.java | 94 ++++++++++++++- .../manager/am/util/ECResourceInfoUtils.java | 20 ++++ .../linkis/manager/am/conf/AMConfiguration.scala | 25 +++- .../service/engine/DefaultEngineStopService.scala | 131 ++++++++++++++++++++- .../am/service/engine/EngineStopService.scala | 25 ++++ .../service/impl/DefaultNodeLabelService.scala | 2 + .../linkis/manager/rm/restful/RMMonitorRest.scala | 8 +- .../apache/linkis/manager/rm/utils/RMUtils.scala | 2 - .../entity/persistence/PersistencerEcNodeInfo.java | 36 +++++- .../linkis/manager/dao/ECResourceRecordMapper.java | 3 + .../linkis/manager/dao/NodeManagerMapper.java | 4 + .../manager/dao/NodeMetricManagerMapper.java | 5 + .../impl/DefaultNodeMetricManagerPersistence.java | 15 ++- .../mapper/common/ECResourceRecordMapper.xml | 26 ++++ .../resources/mapper/common/NodeManagerMapper.xml | 22 ++++ .../mapper/common/NodeMetricManagerMapper.xml | 10 ++ linkis-dist/package/conf/linkis.properties | 6 + linkis-dist/package/db/linkis_ddl.sql | 2 +- .../db/upgrade/1.3.2_schema/mysql/linkis_ddl.sql | 6 +- .../engineplugin/spark/executor/SQLSession.scala | 96 +++++++++++++-- .../src/test/resources/application.properties | 4 + .../core/restful/DataSourceCoreRestfulApi.java | 6 +- .../restful/api/JobhistorySettingApi.java | 27 +++-- .../jobhistory/restful/api/QueryRestfulApi.java | 11 +- .../jobhistory/conf/JobhistoryConfiguration.scala | 3 +- .../jobhistory/conversions/TaskConversions.scala | 23 +++- .../apache/linkis/jobhistory/util/QueryUtils.scala | 13 +- .../conf/JobhistoryConfigurationTest.scala | 2 - .../linkis/jobhistory/util/QueryUtilsTest.scala | 19 +-- .../filesystem/conf/WorkSpaceConfiguration.java | 3 - .../filesystem/restful/api/FsRestfulApi.java | 7 +- .../linkis/filesystem/util/WorkspaceUtil.java | 7 -- .../conf/WorkSpaceConfigurationTest.java | 2 - .../linkis/filesystem/util/WorkspaceUtilTest.java | 18 +-- .../org/apache/linkis/udf/api/UDFRestfulApi.java | 4 +- 45 files changed, 904 insertions(+), 178 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
