more db

eventmesh-admin-server/build.gradle

@@ -3,6 +3,7 @@ dependencies {
 	implementation project(":eventmesh-common")
 	implementation project(":eventmesh-registry:eventmesh-registry-api")
 	implementation project(":eventmesh-registry:eventmesh-registry-nacos")
+	implementation project(':eventmesh-openconnect:eventmesh-openconnect-offsetmgmt-plugin:eventmesh-openconnect-offsetmgmt-api')
 	implementation "com.alibaba.nacos:nacos-client"
 	implementation ("org.springframework.boot:spring-boot-starter-web") {
 		exclude group: "org.springframework.boot", module: "spring-boot-starter-tomcat"

eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/AdminGrpcServer.java

@@ -1,8 +1,8 @@
 package com.apache.eventmesh.admin.server.web;
 
 import com.apache.eventmesh.admin.server.AdminServerException;
-import com.apache.eventmesh.admin.server.web.handler.BaseRequestHandler;
-import com.apache.eventmesh.admin.server.web.handler.RequestHandlerFactory;
+import com.apache.eventmesh.admin.server.web.handler.request.BaseRequestHandler;
+import com.apache.eventmesh.admin.server.web.handler.request.impl.RequestHandlerFactory;
 import io.grpc.stub.ServerCallStreamObserver;
 import io.grpc.stub.StreamObserver;
 import lombok.extern.slf4j.Slf4j;

eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/GrpcServer.java

@@ -38,6 +38,7 @@ public void destroy() {
                 server.shutdown();
                 if(!server.awaitTermination(30, TimeUnit.SECONDS)) {
                     log.warn("[{}] server don't graceful stop in 30s, it will shutdown now", this.getClass().getSimpleName());
+                    server.shutdownNow();
                 }
             }
         } catch (Exception e) {

eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/DBThreadPool.java

@@ -0,0 +1,38 @@
+package com.apache.eventmesh.admin.server.web.db;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.eventmesh.common.EventMeshThreadFactory;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PreDestroy;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
+@Component
+@Slf4j
+public class DBThreadPool {
+    private final ThreadPoolExecutor executor =
+            new ThreadPoolExecutor(Runtime.getRuntime().availableProcessors() * 2,
+                    Runtime.getRuntime().availableProcessors() * 2, 0L, TimeUnit.SECONDS,
+                    new LinkedBlockingQueue<>(1000), new EventMeshThreadFactory("admin-server-db"),
+                    new ThreadPoolExecutor.DiscardOldestPolicy());
+    @PreDestroy
+    private void destroy() {
+        if (!executor.isShutdown()) {
+            try {
+                executor.shutdown();
+                if (!executor.awaitTermination(30, TimeUnit.SECONDS)) {
+                    log.info("wait heart beat handler thread pool shutdown timeout, it will shutdown immediately");
+                    executor.shutdownNow();
+                }
+            } catch (InterruptedException e) {
+                log.warn("wait heart beat handler thread pool shutdown fail");
+            }
+        }
+    }
+
+    public ThreadPoolExecutor getExecutors() {
+        return executor;
+    }
+}

eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/entity/EventMeshJobInfo.java

@@ -29,8 +29,6 @@ public class EventMeshJobInfo implements Serializable {
 
     private Integer jobType;
 
-    private Integer position;
-
     private Integer createUid;
 
     private Integer updateUid;

eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/entity/EventMeshJobPosition.java → eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/entity/EventMeshMysqlPosition.java

@@ -9,11 +9,11 @@
 import java.util.Date;
 
 /**
- * @TableName event_mesh_job_position
+ * @TableName event_mesh_mysql_position
  */
-@TableName(value ="event_mesh_job_position")
+@TableName(value ="event_mesh_mysql_position")
 @Data
-public class EventMeshJobPosition implements Serializable {
+public class EventMeshMysqlPosition implements Serializable {
     @TableId(type = IdType.AUTO)
     private Integer id;
 
@@ -23,6 +23,10 @@ public class EventMeshJobPosition implements Serializable {
 
     private Long position;
 
+    private Long timestamp;
+
+    private String journalName;
+
     private Date createTime;
 
     private Date updateTime;

eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/entity/EventMeshPositionReporterHistory.java

@@ -0,0 +1,29 @@
+package com.apache.eventmesh.admin.server.web.db.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @TableName event_mesh_position_reporter_history
+ */
+@TableName(value ="event_mesh_position_reporter_history")
+@Data
+public class EventMeshPositionReporterHistory implements Serializable {
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    private Integer job;
+
+    private String record;
+
+    private String address;
+
+    private Date createTime;
+
+    private static final long serialVersionUID = 1L;
+}

eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/entity/EventMeshHeartbeat.java → eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/entity/EventMeshRuntimeHeartbeat.java

@@ -6,15 +6,16 @@
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
- * @TableName event_mesh_heartbeat
+ * @TableName event_mesh_runtime_heartbeat
  */
-@TableName(value ="event_mesh_heartbeat")
+@TableName(value ="event_mesh_runtime_heartbeat")
 @Data
-public class EventMeshHeartbeat implements Serializable {
+public class EventMeshRuntimeHeartbeat implements Serializable {
     @TableId(type = IdType.AUTO)
-    private Integer id;
+    private Long id;
 
     private String adminAddr;
 
@@ -24,7 +25,9 @@ public class EventMeshHeartbeat implements Serializable {
 
     private String reportTime;
 
-    private String updateTime;
+    private Date updateTime;
+
+    private Date createTime;
 
     private static final long serialVersionUID = 1L;
 }

eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/entity/EventMeshRuntimeHistory.java

@@ -0,0 +1,27 @@
+package com.apache.eventmesh.admin.server.web.db.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @TableName event_mesh_runtime_history
+ */
+@TableName(value ="event_mesh_runtime_history")
+@Data
+public class EventMeshRuntimeHistory implements Serializable {
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    private Integer job;
+
+    private String address;
+
+    private Date createTime;
+
+    private static final long serialVersionUID = 1L;
+}

eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/mapper/EventMeshDataSourceMapper.java

@@ -1,20 +1,20 @@
-package com.apache.eventmesh.admin.server.web.db.mapper;
-
-import com.apache.eventmesh.admin.server.web.db.entity.EventMeshDataSource;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
-* @author sodafang
-* @description 针对表【event_mesh_data_source】的数据库操作Mapper
-* @createDate 2024-05-09 15:52:49
-* @Entity com.apache.eventmesh.admin.server.web.db.entity.EventMeshDataSource
-*/
-@Mapper
-public interface EventMeshDataSourceMapper extends BaseMapper<EventMeshDataSource> {
-
-}
-
-
-
-
+package com.apache.eventmesh.admin.server.web.db.mapper;
+
+import com.apache.eventmesh.admin.server.web.db.entity.EventMeshDataSource;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @author sodafang
+* @description 针对表【event_mesh_data_source】的数据库操作Mapper
+* @createDate 2024-05-09 15:52:49
+* @Entity com.apache.eventmesh.admin.server.web.db.entity.EventMeshDataSource
+*/
+@Mapper
+public interface EventMeshDataSourceMapper extends BaseMapper<EventMeshDataSource> {
+
+}
+
+
+
+

eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/mapper/EventMeshJobInfoMapper.java

@@ -1,20 +1,20 @@
-package com.apache.eventmesh.admin.server.web.db.mapper;
-
-import com.apache.eventmesh.admin.server.web.db.entity.EventMeshJobInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
-* @author sodafang
-* @description 针对表【event_mesh_job_info】的数据库操作Mapper
-* @createDate 2024-05-09 15:51:45
-* @Entity com.apache.eventmesh.admin.server.web.db.entity.EventMeshJobInfo
-*/
-@Mapper
-public interface EventMeshJobInfoMapper extends BaseMapper<EventMeshJobInfo> {
-
-}
-
-
-
-
+package com.apache.eventmesh.admin.server.web.db.mapper;
+
+import com.apache.eventmesh.admin.server.web.db.entity.EventMeshJobInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @author sodafang
+* @description 针对表【event_mesh_job_info】的数据库操作Mapper
+* @createDate 2024-05-09 15:51:45
+* @Entity com.apache.eventmesh.admin.server.web.db.entity.EventMeshJobInfo
+*/
+@Mapper
+public interface EventMeshJobInfoMapper extends BaseMapper<EventMeshJobInfo> {
+
+}
+
+
+
+

eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/mapper/EventMeshHeartbeatMapper.java → eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/mapper/EventMeshMysqlPositionMapper.java

@@ -1,20 +1,20 @@
-package com.apache.eventmesh.admin.server.web.db.mapper;
-
-import com.apache.eventmesh.admin.server.web.db.entity.EventMeshHeartbeat;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
-* @author sodafang
-* @description 针对表【event_mesh_heartbeat】的数据库操作Mapper
-* @createDate 2024-05-10 16:05:00
-* @Entity com.apache.eventmesh.admin.server.web.db.entity.EventMeshHeartbeat
-*/
-@Mapper
-public interface EventMeshHeartbeatMapper extends BaseMapper<EventMeshHeartbeat> {
-
-}
-
-
-
-
+package com.apache.eventmesh.admin.server.web.db.mapper;
+
+import com.apache.eventmesh.admin.server.web.db.entity.EventMeshMysqlPosition;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @author sodafang
+* @description 针对表【event_mesh_mysql_position】的数据库操作Mapper
+* @createDate 2024-05-14 17:15:03
+* @Entity com.apache.eventmesh.admin.server.web.db.entity.EventMeshMysqlPosition
+*/
+@Mapper
+public interface EventMeshMysqlPositionMapper extends BaseMapper<EventMeshMysqlPosition> {
+
+}
+
+
+
+

eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/mapper/EventMeshPositionReporterHistoryMapper.java

@@ -0,0 +1,20 @@
+package com.apache.eventmesh.admin.server.web.db.mapper;
+
+import com.apache.eventmesh.admin.server.web.db.entity.EventMeshPositionReporterHistory;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @author sodafang
+* @description 针对表【event_mesh_position_reporter_history(记录position上报者变更时，老记录)】的数据库操作Mapper
+* @createDate 2024-05-14 17:15:03
+* @Entity com.apache.eventmesh.admin.server.web.db.entity.EventMeshPositionReporterHistory
+*/
+@Mapper
+public interface EventMeshPositionReporterHistoryMapper extends BaseMapper<EventMeshPositionReporterHistory> {
+
+}
+
+
+
+

eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/mapper/EventMeshJobPositionMapper.java → eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/mapper/EventMeshRuntimeHeartbeatMapper.java

@@ -1,20 +1,20 @@
-package com.apache.eventmesh.admin.server.web.db.mapper;
-
-import com.apache.eventmesh.admin.server.web.db.entity.EventMeshJobPosition;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
-* @author sodafang
-* @description 针对表【event_mesh_job_position】的数据库操作Mapper
-* @createDate 2024-05-09 09:33:01
-* @Entity com.apache.eventmesh.admin.server.web.db.entity.EventMeshJobPosition
-*/
-@Mapper
-public interface EventMeshJobPositionMapper extends BaseMapper<EventMeshJobPosition> {
-
-}
-
-
-
-
+package com.apache.eventmesh.admin.server.web.db.mapper;
+
+import com.apache.eventmesh.admin.server.web.db.entity.EventMeshRuntimeHeartbeat;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @author sodafang
+* @description 针对表【event_mesh_runtime_heartbeat】的数据库操作Mapper
+* @createDate 2024-05-14 17:15:03
+* @Entity com.apache.eventmesh.admin.server.web.db.entity.EventMeshRuntimeHeartbeat
+*/
+@Mapper
+public interface EventMeshRuntimeHeartbeatMapper extends BaseMapper<EventMeshRuntimeHeartbeat> {
+
+}
+
+
+
+

eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/db/mapper/EventMeshRuntimeHistoryMapper.java

@@ -0,0 +1,20 @@
+package com.apache.eventmesh.admin.server.web.db.mapper;
+
+import com.apache.eventmesh.admin.server.web.db.entity.EventMeshRuntimeHistory;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @author sodafang
+* @description 针对表【event_mesh_runtime_history(记录runtime上运行任务的变更)】的数据库操作Mapper
+* @createDate 2024-05-14 17:15:03
+* @Entity com.apache.eventmesh.admin.server.web.db.entity.EventMeshRuntimeHistory
+*/
+@Mapper
+public interface EventMeshRuntimeHistoryMapper extends BaseMapper<EventMeshRuntimeHistory> {
+
+}
+
+
+
+