Skip to content

Commit 47fe25f

Browse files
yx9oRongtongJin
authored andcommitted
[ISSUE #9188] Use fastjson2 in org/apache/rocketmq/broker/config/v1 (#9189)
1 parent a3a81d5 commit 47fe25f

File tree

3 files changed

+27
-24
lines changed

3 files changed

+27
-24
lines changed

broker/src/main/java/org/apache/rocketmq/broker/config/v1/RocksDBConsumerOffsetManager.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,8 @@
1616
*/
1717
package org.apache.rocketmq.broker.config.v1;
1818

19-
import com.alibaba.fastjson.JSON;
20-
import com.alibaba.fastjson.serializer.SerializerFeature;
21-
import java.io.File;
22-
import java.util.Iterator;
23-
import java.util.Map.Entry;
24-
import java.util.concurrent.ConcurrentMap;
19+
import com.alibaba.fastjson2.JSON;
20+
import com.alibaba.fastjson2.JSONWriter;
2521
import org.apache.rocketmq.broker.BrokerController;
2622
import org.apache.rocketmq.broker.RocksDBConfigManager;
2723
import org.apache.rocketmq.broker.offset.ConsumerOffsetManager;
@@ -34,6 +30,11 @@
3430
import org.rocksdb.CompressionType;
3531
import org.rocksdb.WriteBatch;
3632

33+
import java.io.File;
34+
import java.util.Iterator;
35+
import java.util.Map.Entry;
36+
import java.util.concurrent.ConcurrentMap;
37+
3738
public class RocksDBConsumerOffsetManager extends ConsumerOffsetManager {
3839

3940
protected static final Logger log = LoggerFactory.getLogger(LoggerName.BROKER_LOGGER_NAME);
@@ -147,7 +148,7 @@ private void putWriteBatch(final WriteBatch writeBatch, final String topicGroupN
147148
byte[] keyBytes = topicGroupName.getBytes(DataConverter.CHARSET_UTF8);
148149
RocksDBOffsetSerializeWrapper wrapper = new RocksDBOffsetSerializeWrapper();
149150
wrapper.setOffsetTable(offsetMap);
150-
byte[] valueBytes = JSON.toJSONBytes(wrapper, SerializerFeature.BrowserCompatible);
151+
byte[] valueBytes = JSON.toJSONBytes(wrapper, JSONWriter.Feature.BrowserCompatible);
151152
writeBatch.put(keyBytes, valueBytes);
152153
}
153154

broker/src/main/java/org/apache/rocketmq/broker/config/v1/RocksDBSubscriptionGroupManager.java

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,9 @@
1616
*/
1717
package org.apache.rocketmq.broker.config.v1;
1818

19-
import com.alibaba.fastjson.JSON;
20-
import com.alibaba.fastjson.JSONObject;
21-
import com.alibaba.fastjson.serializer.SerializerFeature;
22-
import java.io.File;
23-
import java.util.Map;
24-
import java.util.Set;
25-
import java.util.concurrent.ConcurrentHashMap;
26-
import java.util.concurrent.ConcurrentMap;
27-
import java.util.function.BiConsumer;
19+
import com.alibaba.fastjson2.JSON;
20+
import com.alibaba.fastjson2.JSONObject;
21+
import com.alibaba.fastjson2.JSONWriter;
2822
import org.apache.rocketmq.broker.BrokerController;
2923
import org.apache.rocketmq.broker.RocksDBConfigManager;
3024
import org.apache.rocketmq.broker.subscription.SubscriptionGroupManager;
@@ -35,6 +29,13 @@
3529
import org.rocksdb.CompressionType;
3630
import org.rocksdb.RocksIterator;
3731

32+
import java.io.File;
33+
import java.util.Map;
34+
import java.util.Set;
35+
import java.util.concurrent.ConcurrentHashMap;
36+
import java.util.concurrent.ConcurrentMap;
37+
import java.util.function.BiConsumer;
38+
3839
public class RocksDBSubscriptionGroupManager extends SubscriptionGroupManager {
3940

4041
protected transient RocksDBConfigManager rocksDBConfigManager;
@@ -132,7 +133,7 @@ public SubscriptionGroupConfig putSubscriptionGroupConfig(SubscriptionGroupConfi
132133

133134
try {
134135
byte[] keyBytes = groupName.getBytes(DataConverter.CHARSET_UTF8);
135-
byte[] valueBytes = JSON.toJSONBytes(subscriptionGroupConfig, SerializerFeature.BrowserCompatible);
136+
byte[] valueBytes = JSON.toJSONBytes(subscriptionGroupConfig, JSONWriter.Feature.BrowserCompatible);
136137
this.rocksDBConfigManager.put(keyBytes, keyBytes.length, valueBytes);
137138
} catch (Exception e) {
138139
log.error("kv put sub Failed, {}", subscriptionGroupConfig.toString());
@@ -147,7 +148,7 @@ protected SubscriptionGroupConfig putSubscriptionGroupConfigIfAbsent(Subscriptio
147148
if (oldConfig == null) {
148149
try {
149150
byte[] keyBytes = groupName.getBytes(DataConverter.CHARSET_UTF8);
150-
byte[] valueBytes = JSON.toJSONBytes(subscriptionGroupConfig, SerializerFeature.BrowserCompatible);
151+
byte[] valueBytes = JSON.toJSONBytes(subscriptionGroupConfig, JSONWriter.Feature.BrowserCompatible);
151152
this.rocksDBConfigManager.put(keyBytes, keyBytes.length, valueBytes);
152153
} catch (Exception e) {
153154
log.error("kv put sub Failed, {}", subscriptionGroupConfig.toString());

broker/src/main/java/org/apache/rocketmq/broker/config/v1/RocksDBTopicConfigManager.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,8 @@
1616
*/
1717
package org.apache.rocketmq.broker.config.v1;
1818

19-
import com.alibaba.fastjson.JSON;
20-
import com.alibaba.fastjson.serializer.SerializerFeature;
21-
import java.io.File;
22-
import java.util.Map;
23-
import java.util.concurrent.ConcurrentMap;
19+
import com.alibaba.fastjson2.JSON;
20+
import com.alibaba.fastjson2.JSONWriter;
2421
import org.apache.rocketmq.broker.BrokerController;
2522
import org.apache.rocketmq.broker.RocksDBConfigManager;
2623
import org.apache.rocketmq.broker.topic.TopicConfigManager;
@@ -30,6 +27,10 @@
3027
import org.apache.rocketmq.remoting.protocol.DataVersion;
3128
import org.rocksdb.CompressionType;
3229

30+
import java.io.File;
31+
import java.util.Map;
32+
import java.util.concurrent.ConcurrentMap;
33+
3334
public class RocksDBTopicConfigManager extends TopicConfigManager {
3435

3536
protected transient RocksDBConfigManager rocksDBConfigManager;
@@ -113,7 +114,7 @@ public TopicConfig putTopicConfig(TopicConfig topicConfig) {
113114
TopicConfig oldTopicConfig = this.topicConfigTable.put(topicName, topicConfig);
114115
try {
115116
byte[] keyBytes = topicName.getBytes(DataConverter.CHARSET_UTF8);
116-
byte[] valueBytes = JSON.toJSONBytes(topicConfig, SerializerFeature.BrowserCompatible);
117+
byte[] valueBytes = JSON.toJSONBytes(topicConfig, JSONWriter.Feature.BrowserCompatible);
117118
this.rocksDBConfigManager.put(keyBytes, keyBytes.length, valueBytes);
118119
} catch (Exception e) {
119120
log.error("kv put topic Failed, {}", topicConfig.toString(), e);

0 commit comments

Comments
 (0)