opensource/rocketmq
3
0
Fork 0
mirror of https://github.com/apache/rocketmq.git synced 2026-09-01 15:47:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "[ISSUE #9188] Use fastjson2 in org/apache/rocketmq/broker/config/v1 (…" (#9386)

Browse Source 
This reverts commit f86fb40904.
This commit is contained in:
lizhimins
2025-05-06 17:55:05 +08:00
committed by GitHub
parent c66e758a1c
commit d78ed1c080
3 changed files with 24 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
broker/src/main/java/org/apache/rocketmq/broker/config/v1/RocksDBConsumerOffsetManager.java
+7 -8
View File
@@ -16,8 +16,12 @@
*/
package org.apache.rocketmq.broker.config.v1;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONWriter;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.serializer.SerializerFeature;
import java.io.File;
import java.util.Iterator;
import java.util.Map.Entry;
import java.util.concurrent.ConcurrentMap;
import org.apache.rocketmq.broker.BrokerController;
import org.apache.rocketmq.broker.RocksDBConfigManager;
import org.apache.rocketmq.broker.offset.ConsumerOffsetManager;
@@ -30,11 +34,6 @@ import org.apache.rocketmq.remoting.protocol.DataVersion;
import org.rocksdb.CompressionType;
import org.rocksdb.WriteBatch;
import java.io.File;
import java.util.Iterator;
import java.util.Map.Entry;
import java.util.concurrent.ConcurrentMap;
public class RocksDBConsumerOffsetManager extends ConsumerOffsetManager {
protected static final Logger log = LoggerFactory.getLogger(LoggerName.BROKER_LOGGER_NAME);
@@ -148,7 +147,7 @@ public class RocksDBConsumerOffsetManager extends ConsumerOffsetManager {
byte[] keyBytes = topicGroupName.getBytes(DataConverter.CHARSET_UTF8);
RocksDBOffsetSerializeWrapper wrapper = new RocksDBOffsetSerializeWrapper();
wrapper.setOffsetTable(offsetMap);
byte[] valueBytes = JSON.toJSONBytes(wrapper, JSONWriter.Feature.BrowserCompatible);
byte[] valueBytes = JSON.toJSONBytes(wrapper, SerializerFeature.BrowserCompatible);
writeBatch.put(keyBytes, valueBytes);
}
broker/src/main/java/org/apache/rocketmq/broker/config/v1/RocksDBSubscriptionGroupManager.java
+11 -12
View File
@@ -16,9 +16,15 @@
*/
package org.apache.rocketmq.broker.config.v1;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.alibaba.fastjson2.JSONWriter;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.SerializerFeature;
import java.io.File;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.function.BiConsumer;
import org.apache.rocketmq.broker.BrokerController;
import org.apache.rocketmq.broker.RocksDBConfigManager;
import org.apache.rocketmq.broker.subscription.SubscriptionGroupManager;
@@ -29,13 +35,6 @@ import org.apache.rocketmq.remoting.protocol.subscription.SubscriptionGroupConfi
import org.rocksdb.CompressionType;
import org.rocksdb.RocksIterator;
import java.io.File;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.function.BiConsumer;
public class RocksDBSubscriptionGroupManager extends SubscriptionGroupManager {
protected transient RocksDBConfigManager rocksDBConfigManager;
@@ -133,7 +132,7 @@ public class RocksDBSubscriptionGroupManager extends SubscriptionGroupManager {
try {
byte[] keyBytes = groupName.getBytes(DataConverter.CHARSET_UTF8);
byte[] valueBytes = JSON.toJSONBytes(subscriptionGroupConfig, JSONWriter.Feature.BrowserCompatible);
byte[] valueBytes = JSON.toJSONBytes(subscriptionGroupConfig, SerializerFeature.BrowserCompatible);
this.rocksDBConfigManager.put(keyBytes, keyBytes.length, valueBytes);
} catch (Exception e) {
log.error("kv put sub Failed, {}", subscriptionGroupConfig.toString());
@@ -148,7 +147,7 @@ public class RocksDBSubscriptionGroupManager extends SubscriptionGroupManager {
if (oldConfig == null) {
try {
byte[] keyBytes = groupName.getBytes(DataConverter.CHARSET_UTF8);
byte[] valueBytes = JSON.toJSONBytes(subscriptionGroupConfig, JSONWriter.Feature.BrowserCompatible);
byte[] valueBytes = JSON.toJSONBytes(subscriptionGroupConfig, SerializerFeature.BrowserCompatible);
this.rocksDBConfigManager.put(keyBytes, keyBytes.length, valueBytes);
} catch (Exception e) {
log.error("kv put sub Failed, {}", subscriptionGroupConfig.toString());
broker/src/main/java/org/apache/rocketmq/broker/config/v1/RocksDBTopicConfigManager.java
+6 -7
View File
@@ -16,8 +16,11 @@
*/
package org.apache.rocketmq.broker.config.v1;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONWriter;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.serializer.SerializerFeature;
import java.io.File;
import java.util.Map;
import java.util.concurrent.ConcurrentMap;
import org.apache.rocketmq.broker.BrokerController;
import org.apache.rocketmq.broker.RocksDBConfigManager;
import org.apache.rocketmq.broker.topic.TopicConfigManager;
@@ -27,10 +30,6 @@ import org.apache.rocketmq.common.utils.DataConverter;
import org.apache.rocketmq.remoting.protocol.DataVersion;
import org.rocksdb.CompressionType;
import java.io.File;
import java.util.Map;
import java.util.concurrent.ConcurrentMap;
public class RocksDBTopicConfigManager extends TopicConfigManager {
protected transient RocksDBConfigManager rocksDBConfigManager;
@@ -114,7 +113,7 @@ public class RocksDBTopicConfigManager extends TopicConfigManager {
TopicConfig oldTopicConfig = this.topicConfigTable.put(topicName, topicConfig);
try {
byte[] keyBytes = topicName.getBytes(DataConverter.CHARSET_UTF8);
byte[] valueBytes = JSON.toJSONBytes(topicConfig, JSONWriter.Feature.BrowserCompatible);
byte[] valueBytes = JSON.toJSONBytes(topicConfig, SerializerFeature.BrowserCompatible);
this.rocksDBConfigManager.put(keyBytes, keyBytes.length, valueBytes);
} catch (Exception e) {
log.error("kv put topic Failed, {}", topicConfig.toString(), e);