From edb1ad36764cead7f84c26a162d1ab379e20b993 Mon Sep 17 00:00:00 2001 From: lhpqaq <657407891@qq.com> Date: Wed, 18 Sep 2024 16:28:44 +0800 Subject: [PATCH] rename update --- .../org/apache/bigtop/manager/dao/repository/BaseDao.java | 4 ++-- .../apache/bigtop/manager/dao/sql/BaseSqlProvider.java | 4 ++-- .../org/apache/bigtop/manager/dao/sql/SQLBuilder.java | 2 +- .../bigtop/manager/server/command/job/AbstractJob.java | 6 +++--- .../manager/server/command/job/ClusterCreateJob.java | 8 ++++---- .../manager/server/command/stage/AbstractStage.java | 6 +++--- .../bigtop/manager/server/command/task/AbstractTask.java | 6 +++--- .../manager/server/command/task/ComponentInstallTask.java | 2 +- .../manager/server/command/task/ComponentStartTask.java | 2 +- .../manager/server/command/task/ComponentStopTask.java | 2 +- .../server/scheduler/ComponentStatusScheduler.java | 4 ++-- .../manager/server/scheduler/HostInfoScheduler.java | 2 +- .../manager/server/service/impl/ClusterServiceImpl.java | 4 ++-- .../manager/server/service/impl/ConfigServiceImpl.java | 2 +- .../manager/server/service/impl/HostServiceImpl.java | 2 +- .../manager/server/service/impl/JobServiceImpl.java | 6 +++--- .../manager/server/service/impl/UserServiceImpl.java | 2 +- 17 files changed, 32 insertions(+), 32 deletions(-) diff --git a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/BaseDao.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/BaseDao.java index 2c85e6f2..5befb7dc 100644 --- a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/BaseDao.java +++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/BaseDao.java @@ -44,8 +44,8 @@ public interface BaseDao { /** * Update the entity by primary key. */ - @UpdateProvider(type = BaseSqlProvider.class, method = "updateById") - int updateById(Entity entity); + @UpdateProvider(type = BaseSqlProvider.class, method = "partialUpdateById") + int partialUpdateById(Entity entity); /** * Query the entity by primary key. diff --git a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/sql/BaseSqlProvider.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/sql/BaseSqlProvider.java index 09eaf94d..58681619 100644 --- a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/sql/BaseSqlProvider.java +++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/sql/BaseSqlProvider.java @@ -46,7 +46,7 @@ public String insert(Entity entity, ProviderContext context) { return SQLBuilder.insert(tableMetaData, entity, databaseId); } - public String updateById(Entity entity, ProviderContext context) { + public String partialUpdateById(Entity entity, ProviderContext context) { Assert.notNull(entity, "entity must not null"); String databaseId = context.getDatabaseId(); @@ -54,7 +54,7 @@ public String updateById(Entity entity, ProviderContext context) { Class entityClass = entity.getClass(); TableMetaData tableMetaData = TableMetaData.forClass(entityClass); - return SQLBuilder.update(tableMetaData, entity, databaseId); + return SQLBuilder.partialUpdate(tableMetaData, entity, databaseId); } public String selectById(Serializable id, ProviderContext context) { diff --git a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/sql/SQLBuilder.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/sql/SQLBuilder.java index 08cfdcd7..60f8dfe9 100644 --- a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/sql/SQLBuilder.java +++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/sql/SQLBuilder.java @@ -97,7 +97,7 @@ public static String insert(TableMetaData tableMetaData, Entity entity, return sql.toString(); } - public static String update(TableMetaData tableMetaData, Entity entity, String databaseId) { + public static String partialUpdate(TableMetaData tableMetaData, Entity entity, String databaseId) { Class entityClass = entity.getClass(); Map fieldColumnMap = tableMetaData.getFieldColumnMap(); diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/AbstractJob.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/AbstractJob.java index 42f1248e..6ae1ee85 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/AbstractJob.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/AbstractJob.java @@ -88,7 +88,7 @@ protected void beforeCreateStages() { @Override public void beforeRun() { jobPO.setState(JobState.PROCESSING.getName()); - jobDao.updateById(jobPO); + jobDao.partialUpdateById(jobPO); } @Override @@ -124,7 +124,7 @@ public void run() { public void onSuccess() { JobPO jobPO = getJobPO(); jobPO.setState(JobState.SUCCESSFUL.getName()); - jobDao.updateById(jobPO); + jobDao.partialUpdateById(jobPO); } @Override @@ -154,7 +154,7 @@ public void onFailure() { if (!stagePOList.isEmpty()) { stageDao.updateStateByIds(stagePOList); } - jobDao.updateById(jobPO); + jobDao.partialUpdateById(jobPO); } @Override diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/ClusterCreateJob.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/ClusterCreateJob.java index 47a27447..91a4c609 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/ClusterCreateJob.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/ClusterCreateJob.java @@ -77,22 +77,22 @@ public void onSuccess() { // Update cluster state to installed clusterPO.setState(MaintainState.INSTALLED.getName()); - clusterDao.updateById(clusterPO); + clusterDao.partialUpdateById(clusterPO); // Link job to cluster after cluster successfully added JobPO jobPO = getJobPO(); jobPO.setClusterId(clusterPO.getId()); - jobDao.updateById(jobPO); + jobDao.partialUpdateById(jobPO); for (Stage stage : getStages()) { StagePO stagePO = stage.getStagePO(); stagePO.setClusterId(clusterPO.getId()); - stageDao.updateById(stagePO); + stageDao.partialUpdateById(stagePO); for (Task task : stage.getTasks()) { TaskPO taskPO = task.getTaskPO(); taskPO.setClusterId(clusterPO.getId()); - taskDao.updateById(taskPO); + taskDao.partialUpdateById(taskPO); } } } diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/stage/AbstractStage.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/stage/AbstractStage.java index f0a75671..07259a39 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/stage/AbstractStage.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/stage/AbstractStage.java @@ -76,7 +76,7 @@ protected String getComponentName() { @Override public void beforeRun() { stagePO.setState(JobState.PROCESSING.getName()); - stageDao.updateById(stagePO); + stageDao.partialUpdateById(stagePO); } @Override @@ -121,14 +121,14 @@ public Boolean run() { public void onSuccess() { StagePO stagePO = getStagePO(); stagePO.setState(JobState.SUCCESSFUL.getName()); - stageDao.updateById(stagePO); + stageDao.partialUpdateById(stagePO); } @Override public void onFailure() { StagePO stagePO = getStagePO(); stagePO.setState(JobState.FAILED.getName()); - stageDao.updateById(stagePO); + stageDao.partialUpdateById(stagePO); } @Override diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/task/AbstractTask.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/task/AbstractTask.java index 41f840c5..e8767cbb 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/task/AbstractTask.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/task/AbstractTask.java @@ -68,7 +68,7 @@ protected String getCustomCommand() { @Override public void beforeRun() { taskPO.setState(JobState.PROCESSING.getName()); - taskDao.updateById(taskPO); + taskDao.partialUpdateById(taskPO); } @Override @@ -106,7 +106,7 @@ public void onSuccess() { TaskPO taskPO = getTaskPO(); taskPO.setContent(ProtobufUtil.toJson(commandRequest)); taskPO.setState(JobState.SUCCESSFUL.getName()); - taskDao.updateById(taskPO); + taskDao.partialUpdateById(taskPO); } @Override @@ -114,7 +114,7 @@ public void onFailure() { TaskPO taskPO = getTaskPO(); taskPO.setContent(ProtobufUtil.toJson(commandRequest)); taskPO.setState(JobState.FAILED.getName()); - taskDao.updateById(taskPO); + taskDao.partialUpdateById(taskPO); } @Override diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/task/ComponentInstallTask.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/task/ComponentInstallTask.java index 91f003cb..176a8e74 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/task/ComponentInstallTask.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/task/ComponentInstallTask.java @@ -43,7 +43,7 @@ public void onSuccess() { HostComponentPO hostComponentPO = hostComponentDao.findByClusterIdAndComponentNameAndHostname(clusterId, componentName, hostname); hostComponentPO.setState(MaintainState.INSTALLED.getName()); - hostComponentDao.updateById(hostComponentPO); + hostComponentDao.partialUpdateById(hostComponentPO); } @Override diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/task/ComponentStartTask.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/task/ComponentStartTask.java index fca02aa8..aed3898c 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/task/ComponentStartTask.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/task/ComponentStartTask.java @@ -43,7 +43,7 @@ public void onSuccess() { HostComponentPO hostComponentPO = hostComponentDao.findByClusterIdAndComponentNameAndHostname(clusterId, componentName, hostname); hostComponentPO.setState(MaintainState.STARTED.getName()); - hostComponentDao.updateById(hostComponentPO); + hostComponentDao.partialUpdateById(hostComponentPO); } @Override diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/task/ComponentStopTask.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/task/ComponentStopTask.java index b779aa44..2b7ea999 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/task/ComponentStopTask.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/task/ComponentStopTask.java @@ -43,7 +43,7 @@ public void onSuccess() { HostComponentPO hostComponentPO = hostComponentDao.findByClusterIdAndComponentNameAndHostname(clusterId, componentName, hostname); hostComponentPO.setState(MaintainState.STOPPED.getName()); - hostComponentDao.updateById(hostComponentPO); + hostComponentDao.partialUpdateById(hostComponentPO); } @Override diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/scheduler/ComponentStatusScheduler.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/scheduler/ComponentStatusScheduler.java index 4c0d99ca..141362c1 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/scheduler/ComponentStatusScheduler.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/scheduler/ComponentStatusScheduler.java @@ -71,13 +71,13 @@ public void execute() { if (reply.getStatus() == 0 && MaintainState.fromString(hostComponentPO.getState()) == MaintainState.STOPPED) { hostComponentPO.setState(MaintainState.STARTED.getName()); - hostComponentDao.updateById(hostComponentPO); + hostComponentDao.partialUpdateById(hostComponentPO); } if (reply.getStatus() != 0 && MaintainState.fromString(hostComponentPO.getState()) == MaintainState.STARTED) { hostComponentPO.setState(MaintainState.STOPPED.getName()); - hostComponentDao.updateById(hostComponentPO); + hostComponentDao.partialUpdateById(hostComponentPO); } } } diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/scheduler/HostInfoScheduler.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/scheduler/HostInfoScheduler.java index f314661d..33ebab04 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/scheduler/HostInfoScheduler.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/scheduler/HostInfoScheduler.java @@ -75,6 +75,6 @@ private void getHostInfo(HostPO hostPO) { hostPO.setState(MaintainState.STOPPED.getName()); } - hostDao.updateById(hostPO); + hostDao.partialUpdateById(hostPO); } } diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/ClusterServiceImpl.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/ClusterServiceImpl.java index 19604a13..d4122362 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/ClusterServiceImpl.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/ClusterServiceImpl.java @@ -87,7 +87,7 @@ public ClusterVO save(ClusterDTO clusterDTO) { clusterDao.findByClusterName(clusterDTO.getClusterName()).orElse(new ClusterPO()); if (oldClusterPO.getId() != null) { clusterPO.setId(oldClusterPO.getId()); - clusterDao.updateById(clusterPO); + clusterDao.partialUpdateById(clusterPO); } else { clusterDao.save(clusterPO); } @@ -126,7 +126,7 @@ public ClusterVO get(Long id) { public ClusterVO update(Long id, ClusterDTO clusterDTO) { ClusterPO clusterPO = ClusterConverter.INSTANCE.fromDTO2PO(clusterDTO); clusterPO.setId(id); - clusterDao.updateById(clusterPO); + clusterDao.partialUpdateById(clusterPO); return ClusterConverter.INSTANCE.fromEntity2VO(clusterPO); } diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/ConfigServiceImpl.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/ConfigServiceImpl.java index 1f5ac9fc..1db6526e 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/ConfigServiceImpl.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/ConfigServiceImpl.java @@ -94,7 +94,7 @@ private void upsertServiceConfig( if (shouldUpdateConfig(existConfigs, configs)) { // Unselect current config currentConfig.setSelected(false); - serviceConfigDao.updateById(currentConfig); + serviceConfigDao.partialUpdateById(currentConfig); // Create a new config String configDesc = "Update config for " + servicePO.getServiceName(); diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/HostServiceImpl.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/HostServiceImpl.java index 7127d0e0..8bc79a36 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/HostServiceImpl.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/HostServiceImpl.java @@ -99,7 +99,7 @@ public HostVO get(Long id) { public HostVO update(Long id, HostDTO hostDTO) { HostPO hostPO = HostConverter.INSTANCE.fromDTO2PO(hostDTO); hostPO.setId(id); - hostDao.updateById(hostPO); + hostDao.partialUpdateById(hostPO); return HostConverter.INSTANCE.fromPO2VO(hostPO); } diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/JobServiceImpl.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/JobServiceImpl.java index b6a30a3c..fbf0bbeb 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/JobServiceImpl.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/JobServiceImpl.java @@ -110,15 +110,15 @@ private void resetJobStatusInDB(JobPO jobPO) { for (StagePO stagePO : jobPO.getStages()) { for (TaskPO taskPO : stagePO.getTasks()) { taskPO.setState(JobState.PENDING.getName()); - taskDao.updateById(taskPO); + taskDao.partialUpdateById(taskPO); } stagePO.setState(JobState.PENDING.getName()); - stageDao.updateById(stagePO); + stageDao.partialUpdateById(stagePO); } jobPO.setState(JobState.PENDING.getName()); - jobDao.updateById(jobPO); + jobDao.partialUpdateById(jobPO); } private Job recreateJob(JobPO jobPO) { diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/UserServiceImpl.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/UserServiceImpl.java index eaa01d26..61568d19 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/UserServiceImpl.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/UserServiceImpl.java @@ -50,7 +50,7 @@ public UserVO update(UserDTO userDTO) { Long id = SessionUserHolder.getUserId(); UserPO userPO = userDao.findOptionalById(id).orElseThrow(() -> new ApiException(ApiExceptionEnum.NEED_LOGIN)); userPO.setNickname(userDTO.getNickname()); - userDao.updateById(userPO); + userDao.partialUpdateById(userPO); return UserConverter.INSTANCE.fromPO2VO(userPO); } }