This is an automated email from the ASF dual-hosted git repository.
healchow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-inlong.git
The following commit(s) were added to refs/heads/master by this push:
new 5db0eb8bd [INLONG-4217][TubeMQ] Add flow control and filtering methods
to the consumption group settings (#4230)
5db0eb8bd is described below
commit 5db0eb8bd32efbec05a3146f5320c513377b317e
Author: Lizhen <[email protected]>
AuthorDate: Tue May 17 15:34:25 2022 +0800
[INLONG-4217][TubeMQ] Add flow control and filtering methods to the
consumption group settings (#4230)
---
.../tubemq/manager/controller/group/GroupController.java | 6 ++++++
.../manager/controller/group/request/DeleteBlackGroupReq.java | 1 +
.../{DeleteBlackGroupReq.java => FilterCondGroupReq.java} | 10 ++++++++--
.../{DeleteBlackGroupReq.java => FlowControlGroupReq.java} | 11 ++++++++---
.../org/apache/inlong/tubemq/manager/service/TubeConst.java | 3 +++
5 files changed, 26 insertions(+), 5 deletions(-)
diff --git
a/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/controller/group/GroupController.java
b/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/controller/group/GroupController.java
index cd5c529ee..f84cadf55 100644
---
a/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/controller/group/GroupController.java
+++
b/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/controller/group/GroupController.java
@@ -26,6 +26,8 @@ import
org.apache.inlong.tubemq.manager.controller.TubeMQResult;
import
org.apache.inlong.tubemq.manager.controller.group.request.AddBlackGroupReq;
import
org.apache.inlong.tubemq.manager.controller.group.request.DeleteBlackGroupReq;
import
org.apache.inlong.tubemq.manager.controller.group.request.DeleteOffsetReq;
+import
org.apache.inlong.tubemq.manager.controller.group.request.FilterCondGroupReq;
+import
org.apache.inlong.tubemq.manager.controller.group.request.FlowControlGroupReq;
import
org.apache.inlong.tubemq.manager.controller.group.request.QueryOffsetReq;
import org.apache.inlong.tubemq.manager.controller.node.request.CloneOffsetReq;
import
org.apache.inlong.tubemq.manager.controller.topic.request.BatchAddGroupAuthReq;
@@ -71,6 +73,10 @@ public class GroupController {
return topicService.rebalanceGroup(gson.fromJson(req,
RebalanceGroupReq.class));
case TubeConst.REBALANCE_CONSUMER:
return masterService.baseRequestMaster(gson.fromJson(req,
RebalanceConsumerReq.class));
+ case TubeConst.FILTER_CONDITION:
+ return masterService.baseRequestMaster(gson.fromJson(req,
FilterCondGroupReq.class));
+ case TubeConst.FLOW_CONTROL:
+ return masterService.baseRequestMaster(gson.fromJson(req,
FlowControlGroupReq.class));
default:
return
TubeMQResult.errorResult(TubeMQErrorConst.NO_SUCH_METHOD);
}
diff --git
a/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/controller/group/request/DeleteBlackGroupReq.java
b/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/controller/group/request/DeleteBlackGroupReq.java
index cea363fb7..bc7588c55 100644
---
a/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/controller/group/request/DeleteBlackGroupReq.java
+++
b/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/controller/group/request/DeleteBlackGroupReq.java
@@ -29,4 +29,5 @@ public class DeleteBlackGroupReq extends BaseReq {
private String topicName;
private String confModAuthToken;
private String groupName;
+ private String modifyUser;
}
diff --git
a/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/controller/group/request/DeleteBlackGroupReq.java
b/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/controller/group/request/FilterCondGroupReq.java
similarity index 86%
copy from
inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/controller/group/request/DeleteBlackGroupReq.java
copy to
inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/controller/group/request/FilterCondGroupReq.java
index cea363fb7..97f2cba90 100644
---
a/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/controller/group/request/DeleteBlackGroupReq.java
+++
b/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/controller/group/request/FilterCondGroupReq.java
@@ -22,11 +22,17 @@ import lombok.EqualsAndHashCode;
import lombok.ToString;
import org.apache.inlong.tubemq.manager.controller.node.request.BaseReq;
+/**
+ * Consumer group filter item record
+ */
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
-public class DeleteBlackGroupReq extends BaseReq {
+public class FilterCondGroupReq extends BaseReq {
+ private String groupName;
private String topicName;
private String confModAuthToken;
- private String groupName;
+ private Integer condStatus;
+ private String filterConds;
+ private String createUser;
}
diff --git
a/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/controller/group/request/DeleteBlackGroupReq.java
b/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/controller/group/request/FlowControlGroupReq.java
similarity index 85%
copy from
inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/controller/group/request/DeleteBlackGroupReq.java
copy to
inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/controller/group/request/FlowControlGroupReq.java
index cea363fb7..768d004c8 100644
---
a/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/controller/group/request/DeleteBlackGroupReq.java
+++
b/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/controller/group/request/FlowControlGroupReq.java
@@ -22,11 +22,16 @@ import lombok.EqualsAndHashCode;
import lombok.ToString;
import org.apache.inlong.tubemq.manager.controller.node.request.BaseReq;
+/**
+ * Consumer group flow control rules
+ */
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
-public class DeleteBlackGroupReq extends BaseReq {
- private String topicName;
- private String confModAuthToken;
+public class FlowControlGroupReq extends BaseReq {
private String groupName;
+ private Integer statusId;
+ private Integer qryPriorityId;
+ private String confModAuthToken;
+ private String createUser;
}
diff --git
a/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/service/TubeConst.java
b/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/service/TubeConst.java
index 57acf76ee..f919738bb 100644
---
a/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/service/TubeConst.java
+++
b/inlong-tubemq/tubemq-manager/src/main/java/org/apache/inlong/tubemq/manager/service/TubeConst.java
@@ -60,6 +60,9 @@ public class TubeConst {
public static final String AUTH_CONTROL = "authControl";
public static final String ADD_TOPIC_TASK = "addTopicTask";
public static final String QUERY_CAN_WRITE = "queryCanWrite";
+ public static final String FILTER_CONDITION = "filterCondition";
+ public static final String FLOW_CONTROL = "flowControl";
+
/**
* status code
