You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@griffin.apache.org by gu...@apache.org on 2023/01/18 00:20:22 UTC
[griffin] branch griffin-1.0.0-dev updated: design net transport protocol (#624)
This is an automated email from the ASF dual-hosted git repository.
guoyp pushed a commit to branch griffin-1.0.0-dev
in repository https://gitbox.apache.org/repos/asf/griffin.git
The following commit(s) were added to refs/heads/griffin-1.0.0-dev by this push:
new 4be27f19 design net transport protocol (#624)
4be27f19 is described below
commit 4be27f19a687a82892c4f2453f5b2849c7b43f7c
Author: dabuliud <wa...@gmail.com>
AuthorDate: Wed Jan 18 08:20:15 2023 +0800
design net transport protocol (#624)
Co-authored-by: Warden <wa...@gmail.com>
---
.../entity/{DQResoueceEnum.java => DQResoueceEnums.java} | 2 +-
.../apache/griffin/core/api/entity/GriffinDQContent.java | 2 +-
.../org/apache/griffin/core/api/entity/GriffinDQTable.java | 2 +-
.../apache/griffin/core/api/transmit/AbstractProtocol.java | 7 +++++++
.../griffin/core/api/transmit/GriffinProtocolEvent.java | 7 +++++++
.../griffin/core/api/transmit/ProtocolEventEnums.java | 14 ++++++++++++++
.../core/api/transmit/TmEnControlProtocolEvent.java | 12 ++++++++++++
.../core/api/transmit/dto/TaskAssignRequestDTO.java | 13 +++++++++++++
.../core/api/transmit/dto/TaskAssignResponseDTO.java | 12 ++++++++++++
.../core/master/{ => bootstrap}/GriffinMasterMain.java | 4 +++-
.../core/worker/{ => bootstrap}/GriffinWorkerMain.java | 4 +++-
.../apache/griffin/core/worker/factory/DQTaskFactory.java | 4 ++--
12 files changed, 76 insertions(+), 7 deletions(-)
diff --git a/core/src/main/java/org/apache/griffin/core/api/entity/DQResoueceEnum.java b/core/src/main/java/org/apache/griffin/core/api/entity/DQResoueceEnums.java
similarity index 68%
rename from core/src/main/java/org/apache/griffin/core/api/entity/DQResoueceEnum.java
rename to core/src/main/java/org/apache/griffin/core/api/entity/DQResoueceEnums.java
index ba8fd35a..ec8f5fcf 100644
--- a/core/src/main/java/org/apache/griffin/core/api/entity/DQResoueceEnum.java
+++ b/core/src/main/java/org/apache/griffin/core/api/entity/DQResoueceEnums.java
@@ -1,5 +1,5 @@
package org.apache.griffin.core.api.entity;
-public enum DQResoueceEnum {
+public enum DQResoueceEnums {
HIVE, KAFKA;
}
diff --git a/core/src/main/java/org/apache/griffin/core/api/entity/GriffinDQContent.java b/core/src/main/java/org/apache/griffin/core/api/entity/GriffinDQContent.java
index 255f4f7b..2f70c713 100644
--- a/core/src/main/java/org/apache/griffin/core/api/entity/GriffinDQContent.java
+++ b/core/src/main/java/org/apache/griffin/core/api/entity/GriffinDQContent.java
@@ -16,5 +16,5 @@ public class GriffinDQContent {
private Long resourceId;
// tableName
private String tableName;
- private DQResoueceEnum resoueceEnum;
+ private DQResoueceEnums resoueceEnum;
}
diff --git a/core/src/main/java/org/apache/griffin/core/api/entity/GriffinDQTable.java b/core/src/main/java/org/apache/griffin/core/api/entity/GriffinDQTable.java
index 4da913b6..74dbb4c9 100644
--- a/core/src/main/java/org/apache/griffin/core/api/entity/GriffinDQTable.java
+++ b/core/src/main/java/org/apache/griffin/core/api/entity/GriffinDQTable.java
@@ -9,5 +9,5 @@ import lombok.Data;
public class GriffinDQTable {
private Long id;
private String tableName;
- private DQResoueceEnum resoueceEnum;
+ private DQResoueceEnums resoueceEnum;
}
diff --git a/core/src/main/java/org/apache/griffin/core/api/transmit/AbstractProtocol.java b/core/src/main/java/org/apache/griffin/core/api/transmit/AbstractProtocol.java
new file mode 100644
index 00000000..1b310a83
--- /dev/null
+++ b/core/src/main/java/org/apache/griffin/core/api/transmit/AbstractProtocol.java
@@ -0,0 +1,7 @@
+package org.apache.griffin.core.api.transmit;
+
+public abstract class AbstractProtocol implements GriffinProtocolEvent{
+ private transient String ip;
+ private transient int port;
+ public abstract ProtocolEventEnums getProtocolEvent();
+}
diff --git a/core/src/main/java/org/apache/griffin/core/api/transmit/GriffinProtocolEvent.java b/core/src/main/java/org/apache/griffin/core/api/transmit/GriffinProtocolEvent.java
new file mode 100644
index 00000000..56893d75
--- /dev/null
+++ b/core/src/main/java/org/apache/griffin/core/api/transmit/GriffinProtocolEvent.java
@@ -0,0 +1,7 @@
+package org.apache.griffin.core.api.transmit;
+
+public interface GriffinProtocolEvent {
+
+ ProtocolEventEnums getProtocolEvent();
+
+}
diff --git a/core/src/main/java/org/apache/griffin/core/api/transmit/ProtocolEventEnums.java b/core/src/main/java/org/apache/griffin/core/api/transmit/ProtocolEventEnums.java
new file mode 100644
index 00000000..c7e3f3b8
--- /dev/null
+++ b/core/src/main/java/org/apache/griffin/core/api/transmit/ProtocolEventEnums.java
@@ -0,0 +1,14 @@
+package org.apache.griffin.core.api.transmit;
+
+public enum ProtocolEventEnums {
+ TASK_ASSIGN_REQUEST(1, "the request for tm to assign task to en"),
+ TASK_ASSIGN_RESPONSE(2, "the response for en to reply to tm");
+
+ private int type;
+ private String desc;
+
+ ProtocolEventEnums(int type, String desc) {
+ this.type = type;
+ this.desc = desc;
+ }
+}
diff --git a/core/src/main/java/org/apache/griffin/core/api/transmit/TmEnControlProtocolEvent.java b/core/src/main/java/org/apache/griffin/core/api/transmit/TmEnControlProtocolEvent.java
new file mode 100644
index 00000000..4a075af7
--- /dev/null
+++ b/core/src/main/java/org/apache/griffin/core/api/transmit/TmEnControlProtocolEvent.java
@@ -0,0 +1,12 @@
+package org.apache.griffin.core.api.transmit;
+
+/**
+ * the Protocol for TaskManager to control ExecuteNode
+ */
+public class TmEnControlProtocolEvent {
+
+
+
+
+
+}
diff --git a/core/src/main/java/org/apache/griffin/core/api/transmit/dto/TaskAssignRequestDTO.java b/core/src/main/java/org/apache/griffin/core/api/transmit/dto/TaskAssignRequestDTO.java
new file mode 100644
index 00000000..2c1e56df
--- /dev/null
+++ b/core/src/main/java/org/apache/griffin/core/api/transmit/dto/TaskAssignRequestDTO.java
@@ -0,0 +1,13 @@
+package org.apache.griffin.core.api.transmit.dto;
+
+import org.apache.griffin.core.api.transmit.AbstractProtocol;
+import org.apache.griffin.core.api.transmit.GriffinProtocolEvent;
+import org.apache.griffin.core.api.transmit.ProtocolEventEnums;
+
+public class TaskAssignRequestDTO extends AbstractProtocol {
+
+ @Override
+ public ProtocolEventEnums getProtocolEvent() {
+ return ProtocolEventEnums.TASK_ASSIGN_REQUEST;
+ }
+}
diff --git a/core/src/main/java/org/apache/griffin/core/api/transmit/dto/TaskAssignResponseDTO.java b/core/src/main/java/org/apache/griffin/core/api/transmit/dto/TaskAssignResponseDTO.java
new file mode 100644
index 00000000..dee86532
--- /dev/null
+++ b/core/src/main/java/org/apache/griffin/core/api/transmit/dto/TaskAssignResponseDTO.java
@@ -0,0 +1,12 @@
+package org.apache.griffin.core.api.transmit.dto;
+
+import org.apache.griffin.core.api.transmit.AbstractProtocol;
+import org.apache.griffin.core.api.transmit.GriffinProtocolEvent;
+import org.apache.griffin.core.api.transmit.ProtocolEventEnums;
+
+public class TaskAssignResponseDTO extends AbstractProtocol {
+ @Override
+ public ProtocolEventEnums getProtocolEvent() {
+ return ProtocolEventEnums.TASK_ASSIGN_RESPONSE;
+ }
+}
diff --git a/core/src/main/java/org/apache/griffin/core/master/GriffinMasterMain.java b/core/src/main/java/org/apache/griffin/core/master/bootstrap/GriffinMasterMain.java
similarity index 75%
rename from core/src/main/java/org/apache/griffin/core/master/GriffinMasterMain.java
rename to core/src/main/java/org/apache/griffin/core/master/bootstrap/GriffinMasterMain.java
index ed009a96..0fa74c08 100644
--- a/core/src/main/java/org/apache/griffin/core/master/GriffinMasterMain.java
+++ b/core/src/main/java/org/apache/griffin/core/master/bootstrap/GriffinMasterMain.java
@@ -1,11 +1,13 @@
-package org.apache.griffin.core.master;
+package org.apache.griffin.core.master.bootstrap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.ComponentScan;
import org.springframework.scheduling.annotation.EnableScheduling;
+@ComponentScan({"org.apache.griffin.core.master", "org.apache.griffin.core.api"})
@SpringBootApplication
@EnableScheduling
public class GriffinMasterMain {
diff --git a/core/src/main/java/org/apache/griffin/core/worker/GriffinWorkerMain.java b/core/src/main/java/org/apache/griffin/core/worker/bootstrap/GriffinWorkerMain.java
similarity index 75%
rename from core/src/main/java/org/apache/griffin/core/worker/GriffinWorkerMain.java
rename to core/src/main/java/org/apache/griffin/core/worker/bootstrap/GriffinWorkerMain.java
index f19e7a5d..9516bcb4 100644
--- a/core/src/main/java/org/apache/griffin/core/worker/GriffinWorkerMain.java
+++ b/core/src/main/java/org/apache/griffin/core/worker/bootstrap/GriffinWorkerMain.java
@@ -1,11 +1,13 @@
-package org.apache.griffin.core.worker;
+package org.apache.griffin.core.worker.bootstrap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.ComponentScan;
import org.springframework.scheduling.annotation.EnableScheduling;
+@ComponentScan({"org.apache.griffin.core.worker", "org.apache.griffin.core.api"})
@SpringBootApplication
@EnableScheduling
public class GriffinWorkerMain {
diff --git a/core/src/main/java/org/apache/griffin/core/worker/factory/DQTaskFactory.java b/core/src/main/java/org/apache/griffin/core/worker/factory/DQTaskFactory.java
index dcb2ce07..8bbd6336 100644
--- a/core/src/main/java/org/apache/griffin/core/worker/factory/DQTaskFactory.java
+++ b/core/src/main/java/org/apache/griffin/core/worker/factory/DQTaskFactory.java
@@ -1,6 +1,6 @@
package org.apache.griffin.core.worker.factory;
-import org.apache.griffin.core.api.entity.DQResoueceEnum;
+import org.apache.griffin.core.api.entity.DQResoueceEnums;
import org.apache.griffin.core.api.entity.GriffinDQBusinessRule;
import org.apache.griffin.core.worker.dao.DQTaskDao;
import org.apache.griffin.core.worker.entity.bo.task.DQBaseTask;
@@ -20,7 +20,7 @@ public class DQTaskFactory {
@Autowired
private DQTaskDao dqTaskDao;
- public List<DQBaseTask> constructTasks(DQResoueceEnum resoueceEnum,
+ public List<DQBaseTask> constructTasks(DQResoueceEnums resoueceEnum,
List<GriffinDQBusinessRule> businessRuleList) {
switch (resoueceEnum) {
// construct hive