builds: merge main into dev/4.2.x (#1922)

* builds: merge dev/4.2.3 into main (#1918)

* enhancement: optimize list tickets api RT (#1903)

* builds: revert submodule from 4.2.4 to 4.2.3 (#1911)

* Revert "optimize"

This reverts commit 8bf866e.

* optimize list tickets

* builds: merge from dev/4.2.3 into main (#1921)

* enhancement: optimize list tickets api RT (#1903)

* builds: revert submodule from 4.2.4 to 4.2.3 (#1911)

* Revert "optimize"

This reverts commit 8bf866e.

* optimize list tickets

* fix(connection): SingleConnectionDataSource concurrent getConnection may have  problems (#1914)

* fix concurrent

* fix concurrent

* fix concurrent

---------

Co-authored-by: pynzzZ <[email protected]>

---------

Co-authored-by: Ang <[email protected]>

Author: MarkPotato777

server/odc-core/src/main/java/com/oceanbase/odc/core/datasource/SingleConnectionDataSource.java

@@ -58,7 +58,7 @@ public class SingleConnectionDataSource extends BaseClassBasedDataSource impleme
     private final boolean autoReconnect;
     @Setter
     private EventPublisher eventPublisher;
-    protected Connection connection;
+    protected volatile Connection connection;
     private final List<ConnectionInitializer> initializerList = new LinkedList<>();
     private Lock lock;
     @Setter
@@ -96,7 +96,7 @@ public Connection getConnection(String username, String password) throws SQLExce
     /**
      * Reset a {@code Connection}
      */
-    public void resetConnection() throws SQLException {
+    public synchronized void resetConnection() throws SQLException {
         log.info("The connection will be reset soon");
         close();
         this.connection = null;
@@ -181,7 +181,7 @@ private void onConnectionReset(Connection connection) {
         }
     }
 
-    private Connection innerCreateConnection() throws SQLException {
+    private synchronized Connection innerCreateConnection() throws SQLException {
         if (this.connection != null) {
             throw new IllegalStateException("Connection is not null");
         }

server/odc-migrate/src/main/resources/migrate/common/V_4_2_3_18__create_list_flow_instance_view.sql

@@ -0,0 +1,20 @@
+CREATE OR REPLACE  VIEW `list_flow_instance_view` AS select /*+use_merge(flow_instance flow_instance_node_task)*/
+    `flow_instance`.`id` AS `id`,
+    `flow_instance`.`create_time` AS `create_time`,
+    `flow_instance`.`update_time` AS `update_time`,
+    `flow_instance`.`name` AS `name`,
+    `flow_instance`.`flow_config_id` AS `flow_config_id`,
+    `flow_instance`.`creator_id` AS `creator_id`,
+    `flow_instance`.`organization_id` AS `organization_id`,
+    `flow_instance`.`process_definition_id` AS `process_definition_id`,
+    `flow_instance`.`process_instance_id` AS `process_instance_id`,
+    `flow_instance`.`status` AS `status`,
+    `flow_instance`.`flow_config_snapshot_xml` AS `flow_config_snapshot_xml`,
+    `flow_instance`.`description` AS `description`,
+    `flow_instance`.`parent_instance_id` AS `parent_instance_id`,
+    `flow_instance`.`project_id` AS `project_id`,
+    `flow_instance_node_task`.`task_type` AS `task_type`
+from
+    (
+        `flow_instance` join `flow_instance_node_task` on  ( `flow_instance`.`id` = `flow_instance_node_task`.`flow_instance_id`)
+    );

server/odc-service/src/main/java/com/oceanbase/odc/metadb/flow/FlowInstanceViewSpecs.java

@@ -16,6 +16,7 @@
 
 package com.oceanbase.odc.metadb.flow;
 
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Date;
 import java.util.Objects;
@@ -98,6 +99,13 @@ public static Specification<FlowInstanceViewEntity> taskTypeIn(Collection<TaskTy
         return SpecificationUtil.columnIn(FLOW_INSTANCE_VIEW_TASK_TYPE, taskTypes);
     }
 
+    public static Specification<FlowInstanceViewEntity> groupByIdAndTaskType() {
+        return (root, query, cb) -> {
+            query.groupBy(Arrays.asList(root.get(FLOW_INSTANCE_VIEW_ID_NAME), root.get(FLOW_INSTANCE_VIEW_TASK_TYPE)));
+            return cb.conjunction();
+        };
+    }
+
     public static Specification<FlowInstanceViewEntity> leftJoinFlowInstanceApprovalView(
             @NotNull Set<String> resourceRoleIdentifiers, Long creatorId, Set<FlowNodeStatus> statusList) {
         return (root, query, builder) -> {

server/odc-service/src/main/java/com/oceanbase/odc/service/flow/FlowInstanceService.java

@@ -399,7 +399,8 @@ public Page<FlowInstanceEntity> listAll(@NotNull Pageable pageable, @NotNull Que
                 .and(FlowInstanceViewSpecs.statusIn(params.getStatuses()))
                 .and(FlowInstanceViewSpecs.createTimeLate(params.getStartTime()))
                 .and(FlowInstanceViewSpecs.createTimeBefore(params.getEndTime()))
-                .and(FlowInstanceViewSpecs.idEquals(targetId));
+                .and(FlowInstanceViewSpecs.idEquals(targetId))
+                .and(FlowInstanceViewSpecs.groupByIdAndTaskType());
         if (params.getType() != null) {
             specification = specification.and(FlowInstanceViewSpecs.taskTypeEquals(params.getType()));
         } else {