[ISSUE 2800] optimize: the spelling of topicSynFlag

ph3636 · ph3636 · web-flow · commit e40a13927c6f · 2021-04-14T16:35:21.000+08:00
Co-authored-by: ph3636 &lt;tianxingguang@kanzhun.com&gt;
diff --git a/client/src/test/java/org/apache/rocketmq/client/impl/factory/MQClientInstanceTest.java b/client/src/test/java/org/apache/rocketmq/client/impl/factory/MQClientInstanceTest.java
@@ -79,7 +79,7 @@ public void testTopicRouteData2TopicPublishInfo() {
         queueData.setPerm(6);
         queueData.setReadQueueNums(3);
         queueData.setWriteQueueNums(4);
-        queueData.setTopicSynFlag(0);
+        queueData.setTopicSysFlag(0);
         queueDataList.add(queueData);
         topicRouteData.setQueueDatas(queueDataList);
 
diff --git a/client/src/test/java/org/apache/rocketmq/client/producer/DefaultMQProducerTest.java b/client/src/test/java/org/apache/rocketmq/client/producer/DefaultMQProducerTest.java
@@ -481,7 +481,7 @@ public static TopicRouteData createTopicRoute() {
         queueData.setPerm(6);
         queueData.setReadQueueNums(3);
         queueData.setWriteQueueNums(4);
-        queueData.setTopicSynFlag(0);
+        queueData.setTopicSysFlag(0);
         queueDataList.add(queueData);
         topicRouteData.setQueueDatas(queueDataList);
         return topicRouteData;
diff --git a/client/src/test/java/org/apache/rocketmq/client/trace/DefaultMQConsumerWithTraceTest.java b/client/src/test/java/org/apache/rocketmq/client/trace/DefaultMQConsumerWithTraceTest.java
@@ -273,7 +273,7 @@ public static TopicRouteData createTopicRoute() {
         queueData.setPerm(6);
         queueData.setReadQueueNums(3);
         queueData.setWriteQueueNums(4);
-        queueData.setTopicSynFlag(0);
+        queueData.setTopicSysFlag(0);
         queueDataList.add(queueData);
         topicRouteData.setQueueDatas(queueDataList);
         return topicRouteData;
@@ -309,7 +309,7 @@ public static TopicRouteData createTraceTopicRoute() {
         queueData.setPerm(6);
         queueData.setReadQueueNums(1);
         queueData.setWriteQueueNums(1);
-        queueData.setTopicSynFlag(1);
+        queueData.setTopicSysFlag(1);
         queueDataList.add(queueData);
         topicRouteData.setQueueDatas(queueDataList);
         return topicRouteData;
diff --git a/client/src/test/java/org/apache/rocketmq/client/trace/DefaultMQProducerWithTraceTest.java b/client/src/test/java/org/apache/rocketmq/client/trace/DefaultMQProducerWithTraceTest.java
@@ -168,7 +168,7 @@ public static TopicRouteData createTopicRoute() {
         queueData.setPerm(6);
         queueData.setReadQueueNums(3);
         queueData.setWriteQueueNums(4);
-        queueData.setTopicSynFlag(0);
+        queueData.setTopicSysFlag(0);
         queueDataList.add(queueData);
         topicRouteData.setQueueDatas(queueDataList);
         return topicRouteData;
@@ -204,7 +204,7 @@ public static TopicRouteData createTraceTopicRoute() {
         queueData.setPerm(6);
         queueData.setReadQueueNums(1);
         queueData.setWriteQueueNums(1);
-        queueData.setTopicSynFlag(1);
+        queueData.setTopicSysFlag(1);
         queueDataList.add(queueData);
         topicRouteData.setQueueDatas(queueDataList);
         return topicRouteData;
diff --git a/common/src/main/java/org/apache/rocketmq/common/protocol/route/QueueData.java b/common/src/main/java/org/apache/rocketmq/common/protocol/route/QueueData.java
@@ -25,7 +25,7 @@ public class QueueData implements Comparable<QueueData> {
     private int readQueueNums;
     private int writeQueueNums;
     private int perm;
-    private int topicSynFlag;
+    private int topicSysFlag;
 
     public int getReadQueueNums() {
         return readQueueNums;
@@ -51,12 +51,12 @@ public void setPerm(int perm) {
         this.perm = perm;
     }
 
-    public int getTopicSynFlag() {
-        return topicSynFlag;
+    public int getTopicSysFlag() {
+        return topicSysFlag;
     }
 
-    public void setTopicSynFlag(int topicSynFlag) {
-        this.topicSynFlag = topicSynFlag;
+    public void setTopicSysFlag(int topicSysFlag) {
+        this.topicSysFlag = topicSysFlag;
     }
 
     @Override
@@ -67,7 +67,7 @@ public int hashCode() {
         result = prime * result + perm;
         result = prime * result + readQueueNums;
         result = prime * result + writeQueueNums;
-        result = prime * result + topicSynFlag;
+        result = prime * result + topicSysFlag;
         return result;
     }
 
@@ -91,15 +91,15 @@ public boolean equals(Object obj) {
             return false;
         if (writeQueueNums != other.writeQueueNums)
             return false;
-        if (topicSynFlag != other.topicSynFlag)
+        if (topicSysFlag != other.topicSysFlag)
             return false;
         return true;
     }
 
     @Override
     public String toString() {
         return "QueueData [brokerName=" + brokerName + ", readQueueNums=" + readQueueNums
-            + ", writeQueueNums=" + writeQueueNums + ", perm=" + perm + ", topicSynFlag=" + topicSynFlag
+            + ", writeQueueNums=" + writeQueueNums + ", perm=" + perm + ", topicSysFlag=" + topicSysFlag
             + "]";
     }
 
diff --git a/common/src/test/java/org/apache/rocketmq/common/protocol/route/TopicRouteDataTest.java b/common/src/test/java/org/apache/rocketmq/common/protocol/route/TopicRouteDataTest.java
@@ -43,7 +43,7 @@ public void testTopicRouteDataClone() throws Exception {
         queueData.setPerm(6);
         queueData.setReadQueueNums(8);
         queueData.setWriteQueueNums(8);
-        queueData.setTopicSynFlag(0);
+        queueData.setTopicSysFlag(0);
 
         List<QueueData> queueDataList = new ArrayList<QueueData>();
         queueDataList.add(queueData);
@@ -78,7 +78,7 @@ public void testTopicRouteDataJsonSerialize() throws Exception {
         queueData.setPerm(6);
         queueData.setReadQueueNums(8);
         queueData.setWriteQueueNums(8);
-        queueData.setTopicSynFlag(0);
+        queueData.setTopicSysFlag(0);
 
         List<QueueData> queueDataList = new ArrayList<QueueData>();
         queueDataList.add(queueData);
diff --git a/namesrv/src/main/java/org/apache/rocketmq/namesrv/routeinfo/RouteInfoManager.java b/namesrv/src/main/java/org/apache/rocketmq/namesrv/routeinfo/RouteInfoManager.java
@@ -220,7 +220,7 @@ private void createAndUpdateQueueData(final String brokerName, final TopicConfig
         queueData.setWriteQueueNums(topicConfig.getWriteQueueNums());
         queueData.setReadQueueNums(topicConfig.getReadQueueNums());
         queueData.setPerm(topicConfig.getPerm());
-        queueData.setTopicSynFlag(topicConfig.getTopicSysFlag());
+        queueData.setTopicSysFlag(topicConfig.getTopicSysFlag());
 
         List<QueueData> queueDataList = this.topicQueueTable.get(topicConfig.getTopicName());
         if (null == queueDataList) {
@@ -684,7 +684,7 @@ public byte[] getUnitTopics() {
                     String topic = topicEntry.getKey();
                     List<QueueData> queueDatas = topicEntry.getValue();
                     if (queueDatas != null && queueDatas.size() > 0
-                        && TopicSysFlag.hasUnitFlag(queueDatas.get(0).getTopicSynFlag())) {
+                        && TopicSysFlag.hasUnitFlag(queueDatas.get(0).getTopicSysFlag())) {
                         topicList.getTopicList().add(topic);
                     }
                 }
@@ -710,7 +710,7 @@ public byte[] getHasUnitSubTopicList() {
                     String topic = topicEntry.getKey();
                     List<QueueData> queueDatas = topicEntry.getValue();
                     if (queueDatas != null && queueDatas.size() > 0
-                        && TopicSysFlag.hasUnitSubFlag(queueDatas.get(0).getTopicSynFlag())) {
+                        && TopicSysFlag.hasUnitSubFlag(queueDatas.get(0).getTopicSysFlag())) {
                         topicList.getTopicList().add(topic);
                     }
                 }
@@ -736,8 +736,8 @@ public byte[] getHasUnitSubUnUnitTopicList() {
                     String topic = topicEntry.getKey();
                     List<QueueData> queueDatas = topicEntry.getValue();
                     if (queueDatas != null && queueDatas.size() > 0
-                        && !TopicSysFlag.hasUnitFlag(queueDatas.get(0).getTopicSynFlag())
-                        && TopicSysFlag.hasUnitSubFlag(queueDatas.get(0).getTopicSynFlag())) {
+                        && !TopicSysFlag.hasUnitFlag(queueDatas.get(0).getTopicSysFlag())
+                        && TopicSysFlag.hasUnitSubFlag(queueDatas.get(0).getTopicSysFlag())) {
                         topicList.getTopicList().add(topic);
                     }
                 }
diff --git a/tools/src/main/java/org/apache/rocketmq/tools/command/topic/UpdateTopicPermSubCommand.java b/tools/src/main/java/org/apache/rocketmq/tools/command/topic/UpdateTopicPermSubCommand.java
@@ -94,7 +94,7 @@ public void execute(final CommandLine commandLine, final Options options,
             topicConfig.setTopicName(topic);
             topicConfig.setWriteQueueNums(queueData.getWriteQueueNums());
             topicConfig.setReadQueueNums(queueData.getReadQueueNums());
-            topicConfig.setTopicSysFlag(queueData.getTopicSynFlag());
+            topicConfig.setTopicSysFlag(queueData.getTopicSysFlag());
             //new perm
             int perm;
             if (commandLine.hasOption('p')) {

Original file line number	Diff line number	Diff line change
`@@ -220,7 +220,7 @@ private void createAndUpdateQueueData(final String brokerName, final TopicConfig`
`220`	`220`	`queueData.setWriteQueueNums(topicConfig.getWriteQueueNums());`
`221`	`221`	`queueData.setReadQueueNums(topicConfig.getReadQueueNums());`
`222`	`222`	`queueData.setPerm(topicConfig.getPerm());`
`223`		`- queueData.setTopicSynFlag(topicConfig.getTopicSysFlag());`
	`223`	`+ queueData.setTopicSysFlag(topicConfig.getTopicSysFlag());`
`224`	`224`
`225`	`225`	`List<QueueData> queueDataList = this.topicQueueTable.get(topicConfig.getTopicName());`
`226`	`226`	`if (null == queueDataList) {`
`@@ -684,7 +684,7 @@ public byte[] getUnitTopics() {`
`684`	`684`	`String topic = topicEntry.getKey();`
`685`	`685`	`List<QueueData> queueDatas = topicEntry.getValue();`
`686`	`686`	`if (queueDatas != null && queueDatas.size() > 0`
`687`		`- && TopicSysFlag.hasUnitFlag(queueDatas.get(0).getTopicSynFlag())) {`
	`687`	`+ && TopicSysFlag.hasUnitFlag(queueDatas.get(0).getTopicSysFlag())) {`
`688`	`688`	`topicList.getTopicList().add(topic);`
`689`	`689`	`}`
`690`	`690`	`}`
`@@ -710,7 +710,7 @@ public byte[] getHasUnitSubTopicList() {`
`710`	`710`	`String topic = topicEntry.getKey();`
`711`	`711`	`List<QueueData> queueDatas = topicEntry.getValue();`
`712`	`712`	`if (queueDatas != null && queueDatas.size() > 0`
`713`		`- && TopicSysFlag.hasUnitSubFlag(queueDatas.get(0).getTopicSynFlag())) {`
	`713`	`+ && TopicSysFlag.hasUnitSubFlag(queueDatas.get(0).getTopicSysFlag())) {`
`714`	`714`	`topicList.getTopicList().add(topic);`
`715`	`715`	`}`
`716`	`716`	`}`
`@@ -736,8 +736,8 @@ public byte[] getHasUnitSubUnUnitTopicList() {`
`736`	`736`	`String topic = topicEntry.getKey();`
`737`	`737`	`List<QueueData> queueDatas = topicEntry.getValue();`
`738`	`738`	`if (queueDatas != null && queueDatas.size() > 0`
`739`		`- && !TopicSysFlag.hasUnitFlag(queueDatas.get(0).getTopicSynFlag())`
`740`		`- && TopicSysFlag.hasUnitSubFlag(queueDatas.get(0).getTopicSynFlag())) {`
	`739`	`+ && !TopicSysFlag.hasUnitFlag(queueDatas.get(0).getTopicSysFlag())`
	`740`	`+ && TopicSysFlag.hasUnitSubFlag(queueDatas.get(0).getTopicSysFlag())) {`
`741`	`741`	`topicList.getTopicList().add(topic);`
`742`	`742`	`}`
`743`	`743`	`}`