Squashed commit of the following:

commit 4cce064 Author: haopeng <[email protected]> Date: Fri Sep 20 14:22:07 2024 +0800 BIGTOP-4230: Add some methods for BaseDao (apache#74) commit 103b8cf Author: timyuer <[email protected]> Date: Fri Sep 20 09:56:29 2024 +0800 BIGTOP-4145: Improve docker development support scripts (apache#73)
lhpqaq · Sep 20, 2024 · 39ea6f1 · 39ea6f1
1 parent f9c20eb
commit 39ea6f1
Show file tree

Hide file tree

Showing 54 changed files with 781 additions and 980 deletions.
diff --git a/...ager-dao/src/main/java/org/apache/bigtop/manager/dao/interceptor/AuditingInterceptor.java b/...ager-dao/src/main/java/org/apache/bigtop/manager/dao/interceptor/AuditingInterceptor.java
@@ -73,7 +73,9 @@ public Object intercept(Invocation invocation) throws Throwable {
             Collection<Object> objects;
             if (parameter instanceof MapperMethod.ParamMap) {
                 MapperMethod.ParamMap<Object> paramMap = ((MapperMethod.ParamMap<Object>) parameter);
-                if (paramMap.get("param1") instanceof Collection) {
+                if (!paramMap.containsKey("param1") && paramMap.containsKey("arg0")) {
+                    objects = ((Collection<Object>) paramMap.get("arg0"));
+                } else if (paramMap.get("param1") instanceof Collection) {
                     objects = ((Collection<Object>) paramMap.get("param1"));
                 } else {
                     objects = Collections.singletonList(paramMap.get("param1"));

diff --git a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/ChatMessagePO.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/ChatMessagePO.java
@@ -37,13 +37,13 @@ public class ChatMessagePO extends BasePO implements Serializable {
     @Column(name = "message", nullable = false, length = 255)
     private String message;
 
-    @Column(name = "sender")
+    @Column(name = "sender", nullable = false)
     private String sender;
 
-    @Column(name = "user_id")
+    @Column(name = "user_id", nullable = false)
     private Long userId;
 
-    @Column(name = "thread_id")
+    @Column(name = "thread_id", nullable = false)
     private Long threadId;
 
     @Column(name = "is_deleted")

diff --git a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/ChatThreadPO.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/ChatThreadPO.java
@@ -38,13 +38,13 @@ public class ChatThreadPO extends BasePO implements Serializable {
     @Column(name = "model", nullable = false, length = 255)
     private String model;
 
-    @Column(name = "thread_info", columnDefinition = "json", nullable = false)
+    @Column(name = "thread_info", columnDefinition = "json")
     private Map<String, String> threadInfo;
 
-    @Column(name = "user_id")
+    @Column(name = "user_id", nullable = false)
     private Long userId;
 
-    @Column(name = "platform_id")
+    @Column(name = "platform_id", nullable = false)
     private Long platformId;
 
     @Column(name = "is_deleted")

diff --git a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/HostPO.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/HostPO.java
@@ -69,7 +69,7 @@ public class HostPO extends BasePO implements Serializable {
     @Column(name = "state")
     private String state;
 
-    @Column(name = "cluster_id")
+    @Column(name = "cluster_id", nullable = false)
     private Long clusterId;
 
     @Transient

diff --git a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/JobPO.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/JobPO.java
@@ -39,14 +39,14 @@ public class JobPO extends BasePO implements Serializable {
     @Column(name = "id")
     private Long id;
 
-    @Column(name = "state")
+    @Column(name = "state", nullable = false)
     private String state;
 
     @Column(name = "name")
     private String name;
 
     @Lob
-    @Column(name = "context")
+    @Column(name = "context", nullable = false)
     private String context;
 
     @Column(name = "cluster_id")

diff --git a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/PlatformAuthorizedPO.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/PlatformAuthorizedPO.java
@@ -39,7 +39,7 @@ public class PlatformAuthorizedPO extends BasePO implements Serializable {
     @Column(name = "credentials", columnDefinition = "json", nullable = false)
     private Map<String, String> credentials;
 
-    @Column(name = "platform_id")
+    @Column(name = "platform_id", nullable = false)
     private Long platformId;
 
     @Column(name = "is_deleted")

diff --git a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/RepoPO.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/RepoPO.java
@@ -53,6 +53,6 @@ public class RepoPO extends BasePO implements Serializable {
     @Column(name = "repo_type")
     private String repoType;
 
-    @Column(name = "cluster_id")
+    @Column(name = "cluster_id", nullable = false)
     private Long clusterId;
 }
diff --git a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/StackPO.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/StackPO.java
@@ -35,9 +35,9 @@ public class StackPO extends BasePO implements Serializable {
     @Column(name = "id")
     private Long id;
 
-    @Column(name = "stack_name")
+    @Column(name = "stack_name", nullable = false)
     private String stackName;
 
-    @Column(name = "stack_version")
+    @Column(name = "stack_version", nullable = false)
     private String stackVersion;
 }
diff --git a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/StagePO.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/StagePO.java
@@ -37,10 +37,10 @@ public class StagePO extends BasePO implements Serializable {
     @Column(name = "id")
     private Long id;
 
-    @Column(name = "name")
+    @Column(name = "name", nullable = false)
     private String name;
 
-    @Column(name = "state")
+    @Column(name = "state", nullable = false)
     private String state;
 
     @Column(name = "order")
@@ -55,7 +55,7 @@ public class StagePO extends BasePO implements Serializable {
     @Column(name = "context")
     private String context;
 
-    @Column(name = "job_id")
+    @Column(name = "job_id", nullable = false)
     private Long jobId;
 
     @Column(name = "cluster_id")

diff --git a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/TaskPO.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/TaskPO.java
@@ -38,7 +38,7 @@ public class TaskPO extends BasePO implements Serializable {
     @Column(name = "name")
     private String name;
 
-    @Column(name = "context")
+    @Column(name = "context", nullable = false)
     private String context;
 
     @Column(name = "state")

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
@@ -42,11 +42,36 @@ public interface BaseDao<Entity> {
     int save(Entity entity);
 
     /**
-     * Update the entity by primary key.
+     * Insert all entities.
+     */
+    @Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "id")
+    @InsertProvider(type = BaseSqlProvider.class, method = "insertList")
+    int saveAll(List<Entity> entities);
+
+    /**
+     * Partially update the entity by primary key.
+     */
+    @UpdateProvider(type = BaseSqlProvider.class, method = "partialUpdateById")
+    int partialUpdateById(Entity entity);
+
+    /**
+     * Fully update the entity by primary key.
      */
     @UpdateProvider(type = BaseSqlProvider.class, method = "updateById")
     int updateById(Entity entity);
 
+    /**
+     * Partially update the entities by primary key.
+     */
+    @UpdateProvider(type = BaseSqlProvider.class, method = "partialUpdateByIds")
+    int partialUpdateByIds(List<Entity> entities);
+
+    /**
+     * Fully update the entities by primary key.
+     */
+    @UpdateProvider(type = BaseSqlProvider.class, method = "updateByIds")
+    int updateByIds(List<Entity> entities);
+
     /**
      * Query the entity by primary key.
      */

diff --git a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/HostDao.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/HostDao.java
@@ -28,8 +28,6 @@
 
 public interface HostDao extends BaseDao<HostPO> {
 
-    int saveAll(@Param("hosts") List<HostPO> hosts);
-
     HostPO findByHostname(@Param("hostname") String hostname);
 
     List<HostPO> findAllByHostnameIn(@Param("hostnames") Collection<String> hostnames);

diff --git a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/RepoDao.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/RepoDao.java
@@ -30,7 +30,5 @@ public interface RepoDao extends BaseDao<RepoPO> {
 
     Optional<RepoPO> findByRepoName(@Param("repoName") String clusterName);
 
-    int saveAll(@Param("clusters") List<RepoPO> repos);
-
     List<RepoPO> findAllByClusterId(@Param("clusterId") Long clusterId);
 }
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
@@ -31,6 +31,7 @@
 import java.io.Serializable;
 import java.lang.reflect.Type;
 import java.util.Collection;
+import java.util.List;
 
 @Slf4j
 public class BaseSqlProvider {
@@ -46,6 +47,43 @@ public <Entity> String insert(Entity entity, ProviderContext context) {
         return SQLBuilder.insert(tableMetaData, entity, databaseId);
     }
 
+    public <Entity> String insertList(List<Entity> entities, ProviderContext context) {
+        Assert.notNull(entities, "entities must not be null");
+        Assert.notEmpty(entities, "entities list must not be empty");
+
+        String databaseId = context.getDatabaseId();
+
+        Class<?> entityClass = entities.get(0).getClass();
+
+        TableMetaData tableMetaData = TableMetaData.forClass(entityClass);
+
+        return SQLBuilder.insertList(tableMetaData, entities, databaseId);
+    }
+
+    public <Entity> String partialUpdateById(Entity entity, ProviderContext context) {
+        Assert.notNull(entity, "entity must not null");
+
+        String databaseId = context.getDatabaseId();
+
+        Class<?> entityClass = entity.getClass();
+        TableMetaData tableMetaData = TableMetaData.forClass(entityClass);
+
+        return SQLBuilder.update(tableMetaData, entity, databaseId, true);
+    }
+
+    public <Entity> String partialUpdateByIds(List<Entity> entities, ProviderContext context) {
+        Assert.notNull(entities, "entities must not be null");
+        Assert.notEmpty(entities, "entities list must not be empty");
+
+        String databaseId = context.getDatabaseId();
+
+        Class<?> entityClass = entities.get(0).getClass();
+
+        TableMetaData tableMetaData = TableMetaData.forClass(entityClass);
+
+        return SQLBuilder.updateList(tableMetaData, entities, databaseId, true);
+    }
+
     public <Entity> String updateById(Entity entity, ProviderContext context) {
         Assert.notNull(entity, "entity must not null");
 
@@ -54,7 +92,20 @@ public <Entity> String updateById(Entity entity, ProviderContext context) {
         Class<?> entityClass = entity.getClass();
         TableMetaData tableMetaData = TableMetaData.forClass(entityClass);
 
-        return SQLBuilder.update(tableMetaData, entity, databaseId);
+        return SQLBuilder.update(tableMetaData, entity, databaseId, false);
+    }
+
+    public <Entity> String updateByIds(List<Entity> entities, ProviderContext context) {
+        Assert.notNull(entities, "entities must not be null");
+        Assert.notEmpty(entities, "entities list must not be empty");
+
+        String databaseId = context.getDatabaseId();
+
+        Class<?> entityClass = entities.get(0).getClass();
+
+        TableMetaData tableMetaData = TableMetaData.forClass(entityClass);
+
+        return SQLBuilder.updateList(tableMetaData, entities, databaseId, false);
     }
 
     public String selectById(Serializable id, ProviderContext context) {