You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by li...@apache.org on 2025/05/06 07:40:28 UTC
(rocketmq) 01/01: Revert "[ISSUE #9188] Use fastjson2 in org/apache/rocketmq/broker/config/v1 (…"
This is an automated email from the ASF dual-hosted git repository.
lizhimin pushed a commit to branch revert-9189-dev-0217
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
commit ab70845ba4bba086174bbacbf8800d75cc970efa
Author: lizhimins <70...@qq.com>
AuthorDate: Tue May 6 15:40:20 2025 +0800
Revert "[ISSUE #9188] Use fastjson2 in org/apache/rocketmq/broker/config/v1 (…"
This reverts commit f86fb4090442ecdb0dda7583c5edbc6cd87c22cd.
---
.../config/v1/RocksDBConsumerOffsetManager.java | 15 +++++++-------
.../config/v1/RocksDBSubscriptionGroupManager.java | 23 +++++++++++-----------
.../config/v1/RocksDBTopicConfigManager.java | 13 ++++++------
3 files changed, 24 insertions(+), 27 deletions(-)
diff --git a/broker/src/main/java/org/apache/rocketmq/broker/config/v1/RocksDBConsumerOffsetManager.java b/broker/src/main/java/org/apache/rocketmq/broker/config/v1/RocksDBConsumerOffsetManager.java
index db3a38a9bf..963c5046f2 100644
--- a/broker/src/main/java/org/apache/rocketmq/broker/config/v1/RocksDBConsumerOffsetManager.java
+++ b/broker/src/main/java/org/apache/rocketmq/broker/config/v1/RocksDBConsumerOffsetManager.java
@@ -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);
}
diff --git a/broker/src/main/java/org/apache/rocketmq/broker/config/v1/RocksDBSubscriptionGroupManager.java b/broker/src/main/java/org/apache/rocketmq/broker/config/v1/RocksDBSubscriptionGroupManager.java
index b82e050909..b208169e41 100644
--- a/broker/src/main/java/org/apache/rocketmq/broker/config/v1/RocksDBSubscriptionGroupManager.java
+++ b/broker/src/main/java/org/apache/rocketmq/broker/config/v1/RocksDBSubscriptionGroupManager.java
@@ -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());
diff --git a/broker/src/main/java/org/apache/rocketmq/broker/config/v1/RocksDBTopicConfigManager.java b/broker/src/main/java/org/apache/rocketmq/broker/config/v1/RocksDBTopicConfigManager.java
index c2ec70ac38..d64f808067 100644
--- a/broker/src/main/java/org/apache/rocketmq/broker/config/v1/RocksDBTopicConfigManager.java
+++ b/broker/src/main/java/org/apache/rocketmq/broker/config/v1/RocksDBTopicConfigManager.java
@@ -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);