Skip to content

Commit d78ed1c

Browse files
authored
Revert "[ISSUE #9188] Use fastjson2 in org/apache/rocketmq/broker/config/v1 (…" (#9386)
This reverts commit f86fb40.
1 parent c66e758 commit d78ed1c

File tree

3 files changed

+24
-27
lines changed

3 files changed

+24
-27
lines changed

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

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

19-
import com.alibaba.fastjson2.JSON;
20-
import com.alibaba.fastjson2.JSONWriter;
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;
2125
import org.apache.rocketmq.broker.BrokerController;
2226
import org.apache.rocketmq.broker.RocksDBConfigManager;
2327
import org.apache.rocketmq.broker.offset.ConsumerOffsetManager;
@@ -30,11 +34,6 @@
3034
import org.rocksdb.CompressionType;
3135
import org.rocksdb.WriteBatch;
3236

33-
import java.io.File;
34-
import java.util.Iterator;
35-
import java.util.Map.Entry;
36-
import java.util.concurrent.ConcurrentMap;
37-
3837
public class RocksDBConsumerOffsetManager extends ConsumerOffsetManager {
3938

4039
protected static final Logger log = LoggerFactory.getLogger(LoggerName.BROKER_LOGGER_NAME);
@@ -148,7 +147,7 @@ private void putWriteBatch(final WriteBatch writeBatch, final String topicGroupN
148147
byte[] keyBytes = topicGroupName.getBytes(DataConverter.CHARSET_UTF8);
149148
RocksDBOffsetSerializeWrapper wrapper = new RocksDBOffsetSerializeWrapper();
150149
wrapper.setOffsetTable(offsetMap);
151-
byte[] valueBytes = JSON.toJSONBytes(wrapper, JSONWriter.Feature.BrowserCompatible);
150+
byte[] valueBytes = JSON.toJSONBytes(wrapper, SerializerFeature.BrowserCompatible);
152151
writeBatch.put(keyBytes, valueBytes);
153152
}
154153

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

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

19-
import com.alibaba.fastjson2.JSON;
20-
import com.alibaba.fastjson2.JSONObject;
21-
import com.alibaba.fastjson2.JSONWriter;
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;
2228
import org.apache.rocketmq.broker.BrokerController;
2329
import org.apache.rocketmq.broker.RocksDBConfigManager;
2430
import org.apache.rocketmq.broker.subscription.SubscriptionGroupManager;
@@ -29,13 +35,6 @@
2935
import org.rocksdb.CompressionType;
3036
import org.rocksdb.RocksIterator;
3137

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-
3938
public class RocksDBSubscriptionGroupManager extends SubscriptionGroupManager {
4039

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

134133
try {
135134
byte[] keyBytes = groupName.getBytes(DataConverter.CHARSET_UTF8);
136-
byte[] valueBytes = JSON.toJSONBytes(subscriptionGroupConfig, JSONWriter.Feature.BrowserCompatible);
135+
byte[] valueBytes = JSON.toJSONBytes(subscriptionGroupConfig, SerializerFeature.BrowserCompatible);
137136
this.rocksDBConfigManager.put(keyBytes, keyBytes.length, valueBytes);
138137
} catch (Exception e) {
139138
log.error("kv put sub Failed, {}", subscriptionGroupConfig.toString());
@@ -148,7 +147,7 @@ protected SubscriptionGroupConfig putSubscriptionGroupConfigIfAbsent(Subscriptio
148147
if (oldConfig == null) {
149148
try {
150149
byte[] keyBytes = groupName.getBytes(DataConverter.CHARSET_UTF8);
151-
byte[] valueBytes = JSON.toJSONBytes(subscriptionGroupConfig, JSONWriter.Feature.BrowserCompatible);
150+
byte[] valueBytes = JSON.toJSONBytes(subscriptionGroupConfig, SerializerFeature.BrowserCompatible);
152151
this.rocksDBConfigManager.put(keyBytes, keyBytes.length, valueBytes);
153152
} catch (Exception e) {
154153
log.error("kv put sub Failed, {}", subscriptionGroupConfig.toString());

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

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

19-
import com.alibaba.fastjson2.JSON;
20-
import com.alibaba.fastjson2.JSONWriter;
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;
2124
import org.apache.rocketmq.broker.BrokerController;
2225
import org.apache.rocketmq.broker.RocksDBConfigManager;
2326
import org.apache.rocketmq.broker.topic.TopicConfigManager;
@@ -27,10 +30,6 @@
2730
import org.apache.rocketmq.remoting.protocol.DataVersion;
2831
import org.rocksdb.CompressionType;
2932

30-
import java.io.File;
31-
import java.util.Map;
32-
import java.util.concurrent.ConcurrentMap;
33-
3433
public class RocksDBTopicConfigManager extends TopicConfigManager {
3534

3635
protected transient RocksDBConfigManager rocksDBConfigManager;
@@ -114,7 +113,7 @@ public TopicConfig putTopicConfig(TopicConfig topicConfig) {
114113
TopicConfig oldTopicConfig = this.topicConfigTable.put(topicName, topicConfig);
115114
try {
116115
byte[] keyBytes = topicName.getBytes(DataConverter.CHARSET_UTF8);
117-
byte[] valueBytes = JSON.toJSONBytes(topicConfig, JSONWriter.Feature.BrowserCompatible);
116+
byte[] valueBytes = JSON.toJSONBytes(topicConfig, SerializerFeature.BrowserCompatible);
118117
this.rocksDBConfigManager.put(keyBytes, keyBytes.length, valueBytes);
119118
} catch (Exception e) {
120119
log.error("kv put topic Failed, {}", topicConfig.toString(), e);

0 commit comments

Comments
 (0)