[ISSUE #7334] registerIncrementBrokerData for single topic update (#7335)

Ziy1-Tan · web-flow · commit dad6b4dadfec · 2023-09-11T14:34:10.000+08:00
Signed-off-by: Ziy1-Tan &lt;ajb459684460@gmail.com&gt;
diff --git a/broker/src/main/java/org/apache/rocketmq/broker/topic/TopicConfigManager.java b/broker/src/main/java/org/apache/rocketmq/broker/topic/TopicConfigManager.java
@@ -290,7 +290,11 @@ public TopicConfig createTopicInSendMessageMethod(final String topic, final Stri
         }
 
         if (createNew) {
-            this.brokerController.registerBrokerAll(false, true, true);
+            if (brokerController.getBrokerConfig().isEnableSingleTopicRegister()) {
+                this.brokerController.registerSingleTopicAll(topicConfig);
+            } else {
+                this.brokerController.registerIncrementBrokerData(topicConfig, dataVersion);
+            }
         }
 
         return topicConfig;
@@ -394,7 +398,11 @@ public TopicConfig createTopicInSendMessageBackMethod(
         }
 
         if (createNew) {
-            this.brokerController.registerBrokerAll(false, true, true);
+            if (brokerController.getBrokerConfig().isEnableSingleTopicRegister()) {
+                this.brokerController.registerSingleTopicAll(topicConfig);
+            } else {
+                this.brokerController.registerIncrementBrokerData(topicConfig, dataVersion);
+            }
         }
 
         return topicConfig;
@@ -435,7 +443,11 @@ public TopicConfig createTopicOfTranCheckMaxTime(final int clientDefaultTopicQue
         }
 
         if (createNew) {
-            this.brokerController.registerBrokerAll(false, true, true);
+            if (brokerController.getBrokerConfig().isEnableSingleTopicRegister()) {
+                this.brokerController.registerSingleTopicAll(topicConfig);
+            } else {
+                this.brokerController.registerIncrementBrokerData(topicConfig, dataVersion);
+            }
         }
 
         return topicConfig;
@@ -461,7 +473,11 @@ public void updateTopicUnitFlag(final String topic, final boolean unit) {
             dataVersion.nextVersion(stateMachineVersion);
 
             this.persist();
-            this.brokerController.registerBrokerAll(false, true, true);
+            if (brokerController.getBrokerConfig().isEnableSingleTopicRegister()) {
+                this.brokerController.registerSingleTopicAll(topicConfig);
+            } else {
+                this.brokerController.registerIncrementBrokerData(topicConfig, dataVersion);
+            }
         }
     }
 
@@ -484,7 +500,11 @@ public void updateTopicUnitSubFlag(final String topic, final boolean hasUnitSub)
             dataVersion.nextVersion(stateMachineVersion);
 
             this.persist();
-            this.brokerController.registerBrokerAll(false, true, true);
+            if (brokerController.getBrokerConfig().isEnableSingleTopicRegister()) {
+                this.brokerController.registerSingleTopicAll(topicConfig);
+            } else {
+                this.brokerController.registerIncrementBrokerData(topicConfig, dataVersion);
+            }
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -290,7 +290,11 @@ public TopicConfig createTopicInSendMessageMethod(final String topic, final Stri`
`290`	`290`	`}`
`291`	`291`
`292`	`292`	`if (createNew) {`
`293`		`- this.brokerController.registerBrokerAll(false, true, true);`
	`293`	`+ if (brokerController.getBrokerConfig().isEnableSingleTopicRegister()) {`
	`294`	`+ this.brokerController.registerSingleTopicAll(topicConfig);`
	`295`	`+ } else {`
	`296`	`+ this.brokerController.registerIncrementBrokerData(topicConfig, dataVersion);`
	`297`	`+ }`
`294`	`298`	`}`
`295`	`299`
`296`	`300`	`return topicConfig;`
`@@ -394,7 +398,11 @@ public TopicConfig createTopicInSendMessageBackMethod(`
`394`	`398`	`}`
`395`	`399`
`396`	`400`	`if (createNew) {`
`397`		`- this.brokerController.registerBrokerAll(false, true, true);`
	`401`	`+ if (brokerController.getBrokerConfig().isEnableSingleTopicRegister()) {`
	`402`	`+ this.brokerController.registerSingleTopicAll(topicConfig);`
	`403`	`+ } else {`
	`404`	`+ this.brokerController.registerIncrementBrokerData(topicConfig, dataVersion);`
	`405`	`+ }`
`398`	`406`	`}`
`399`	`407`
`400`	`408`	`return topicConfig;`
`@@ -435,7 +443,11 @@ public TopicConfig createTopicOfTranCheckMaxTime(final int clientDefaultTopicQue`
`435`	`443`	`}`
`436`	`444`
`437`	`445`	`if (createNew) {`
`438`		`- this.brokerController.registerBrokerAll(false, true, true);`
	`446`	`+ if (brokerController.getBrokerConfig().isEnableSingleTopicRegister()) {`
	`447`	`+ this.brokerController.registerSingleTopicAll(topicConfig);`
	`448`	`+ } else {`
	`449`	`+ this.brokerController.registerIncrementBrokerData(topicConfig, dataVersion);`
	`450`	`+ }`
`439`	`451`	`}`
`440`	`452`
`441`	`453`	`return topicConfig;`
`@@ -461,7 +473,11 @@ public void updateTopicUnitFlag(final String topic, final boolean unit) {`
`461`	`473`	`dataVersion.nextVersion(stateMachineVersion);`
`462`	`474`
`463`	`475`	`this.persist();`
`464`		`- this.brokerController.registerBrokerAll(false, true, true);`
	`476`	`+ if (brokerController.getBrokerConfig().isEnableSingleTopicRegister()) {`
	`477`	`+ this.brokerController.registerSingleTopicAll(topicConfig);`
	`478`	`+ } else {`
	`479`	`+ this.brokerController.registerIncrementBrokerData(topicConfig, dataVersion);`
	`480`	`+ }`
`465`	`481`	`}`
`466`	`482`	`}`
`467`	`483`
`@@ -484,7 +500,11 @@ public void updateTopicUnitSubFlag(final String topic, final boolean hasUnitSub)`
`484`	`500`	`dataVersion.nextVersion(stateMachineVersion);`
`485`	`501`
`486`	`502`	`this.persist();`
`487`		`- this.brokerController.registerBrokerAll(false, true, true);`
	`503`	`+ if (brokerController.getBrokerConfig().isEnableSingleTopicRegister()) {`
	`504`	`+ this.brokerController.registerSingleTopicAll(topicConfig);`
	`505`	`+ } else {`
	`506`	`+ this.brokerController.registerIncrementBrokerData(topicConfig, dataVersion);`
	`507`	`+ }`
`488`	`508`	`}`
`489`	`509`	`}`
`490`	`510`