Skip to content

refactor: replace fastjson1 with fastjson2 on the 0.3.2 line #337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RongtongJin merged 5 commits into from
Aug 14, 2026
Merged

refactor: replace fastjson1 with fastjson2 on the 0.3.2 line #337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ae7fe14
feat: add fastjson2 compatibility codec
Aug 13, 2026
95a648b
fix: initialize MethodHandles before fastjson2
Aug 13, 2026
f648ce1
refactor: route runtime JSON through compatibility codec
Aug 13, 2026
be90b95
refactor: complete fastjson2 migration
Aug 13, 2026
06243f5
build: upgrade fastjson2 to 2.0.64
Aug 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions command/src/main/java/io/openmessaging/storage/dledger/command/AppendCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@

package io.openmessaging.storage.dledger.command;

import com.alibaba.fastjson.JSON;
import com.beust.jcommander.Parameter;
import io.openmessaging.storage.dledger.client.DLedgerClient;
import io.openmessaging.storage.dledger.protocol.AppendEntryResponse;
import io.openmessaging.storage.dledger.utils.DLedgerJsonUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand All @@ -45,7 +45,7 @@ public void doCommand() {
dLedgerClient.startup();
for (int i = 0; i < count; i++) {
AppendEntryResponse response = dLedgerClient.append(data.getBytes());
logger.info("Append Result:{}", JSON.toJSONString(response));
logger.info("Append Result:{}", DLedgerJsonUtils.toJsonString(response));
}
dLedgerClient.shutdown();
}
Expand Down
4 changes: 2 additions & 2 deletions command/src/main/java/io/openmessaging/storage/dledger/command/DLedger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@

package io.openmessaging.storage.dledger.command;

import com.alibaba.fastjson.JSON;
import com.beust.jcommander.JCommander;
import io.openmessaging.storage.dledger.DLedgerConfig;
import io.openmessaging.storage.dledger.proxy.DLedgerProxy;
import io.openmessaging.storage.dledger.proxy.DLedgerProxyConfig;
import io.openmessaging.storage.dledger.proxy.util.ConfigUtils;
import io.openmessaging.storage.dledger.utils.DLedgerJsonUtils;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
Expand Down Expand Up @@ -58,7 +58,7 @@ public static void bootstrapDLedger(List<DLedgerConfig> dLedgerConfigs) {
}
DLedgerProxy dLedgerProxy = new DLedgerProxy(dLedgerConfigs);
dLedgerProxy.startup();
logger.info("DLedgers start ok with config {}", JSON.toJSONString(dLedgerConfigs));
logger.info("DLedgers start ok with config {}", DLedgerJsonUtils.toJsonString(dLedgerConfigs));
Runtime.getRuntime().addShutdownHook(new Thread(new Runnable() {
private volatile boolean hasShutdown = false;

Expand Down
4 changes: 2 additions & 2 deletions command/src/main/java/io/openmessaging/storage/dledger/command/GetCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@

package io.openmessaging.storage.dledger.command;

import com.alibaba.fastjson.JSON;
import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
import io.openmessaging.storage.dledger.client.DLedgerClient;
import io.openmessaging.storage.dledger.entry.DLedgerEntry;
import io.openmessaging.storage.dledger.protocol.GetEntriesResponse;
import io.openmessaging.storage.dledger.utils.DLedgerJsonUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand All @@ -44,7 +44,7 @@ public void doCommand() {
DLedgerClient dLedgerClient = new DLedgerClient(group, peers);
dLedgerClient.startup();
GetEntriesResponse response = dLedgerClient.get(index);
logger.info("Get Result:{}", JSON.toJSONString(response));
logger.info("Get Result:{}", DLedgerJsonUtils.toJsonString(response));
if (response.getEntries() != null && response.getEntries().size() > 0) {
for (DLedgerEntry entry : response.getEntries()) {
logger.info("Get Result index:{} {}", entry.getIndex(), new String(entry.getBody()));
Expand Down
4 changes: 2 additions & 2 deletions ...and/src/main/java/io/openmessaging/storage/dledger/command/LeadershipTransferCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@

package io.openmessaging.storage.dledger.command;

import com.alibaba.fastjson.JSON;
import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
import io.openmessaging.storage.dledger.client.DLedgerClient;
import io.openmessaging.storage.dledger.protocol.DLedgerResponseCode;
import io.openmessaging.storage.dledger.protocol.LeadershipTransferResponse;
import io.openmessaging.storage.dledger.utils.DLedgerJsonUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down Expand Up @@ -51,7 +51,7 @@ public void doCommand() {
dLedgerClient.startup();
LeadershipTransferResponse response = dLedgerClient.leadershipTransfer(leaderId, transfereeId, term);
LOGGER.info("LeadershipTransfer code={}, Result:{}", DLedgerResponseCode.valueOf(response.getCode()),
JSON.toJSONString(response));
DLedgerJsonUtils.toJsonString(response));
dLedgerClient.shutdown();
}
}
4 changes: 2 additions & 2 deletions command/src/main/java/io/openmessaging/storage/dledger/command/ReadFileCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

package io.openmessaging.storage.dledger.command;

import com.alibaba.fastjson.JSON;
import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
import io.openmessaging.storage.dledger.entry.DLedgerEntry;
Expand All @@ -25,6 +24,7 @@
import io.openmessaging.storage.dledger.store.file.MmapFile;
import io.openmessaging.storage.dledger.store.file.MmapFileList;
import io.openmessaging.storage.dledger.store.file.SelectMmapBufferResult;
import io.openmessaging.storage.dledger.utils.DLedgerJsonUtils;
import java.nio.ByteBuffer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -74,7 +74,7 @@ public void doCommand() {
logger.info("magic={} pos={} size={} index={} term={}", buffer.getInt(), buffer.getLong(), buffer.getInt(), buffer.getLong(), buffer.getLong());
} else {
DLedgerEntry entry = DLedgerEntryCoder.decode(buffer, readBody);
logger.info(JSON.toJSONString(entry));
logger.info(DLedgerJsonUtils.toJsonString(entry));
}
}
}
12 changes: 11 additions & 1 deletion dledger/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,16 @@
<dependency>
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-remoting</artifactId>
<exclusions>
<exclusion>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand All @@ -56,4 +66,4 @@
</dependency>
</dependencies>

</project>
</project>
6 changes: 3 additions & 3 deletions dledger/src/main/java/io/openmessaging/storage/dledger/DLedgerEntryPusher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

package io.openmessaging.storage.dledger;

import com.alibaba.fastjson.JSON;
import io.openmessaging.storage.dledger.entry.DLedgerEntry;
import io.openmessaging.storage.dledger.exception.DLedgerException;
import io.openmessaging.storage.dledger.protocol.AppendEntryResponse;
Expand All @@ -27,6 +26,7 @@
import io.openmessaging.storage.dledger.store.DLedgerMemoryStore;
import io.openmessaging.storage.dledger.store.DLedgerStore;
import io.openmessaging.storage.dledger.store.file.DLedgerMmapFileStore;
import io.openmessaging.storage.dledger.utils.DLedgerJsonUtils;
import io.openmessaging.storage.dledger.utils.DLedgerUtils;
import io.openmessaging.storage.dledger.utils.Pair;
import io.openmessaging.storage.dledger.utils.PreConditions;
Expand Down Expand Up @@ -270,10 +270,10 @@ public void doWork() {
if (DLedgerEntryPusher.this.fsmCaller.isPresent()) {
final long lastAppliedIndex = DLedgerEntryPusher.this.fsmCaller.get().getLastAppliedIndex();
logger.info("[{}][{}] term={} ledgerBegin={} ledgerEnd={} committed={} watermarks={} appliedIndex={}",
memberState.getSelfId(), memberState.getRole(), memberState.currTerm(), dLedgerStore.getLedgerBeginIndex(), dLedgerStore.getLedgerEndIndex(), dLedgerStore.getCommittedIndex(), JSON.toJSONString(peerWaterMarksByTerm), lastAppliedIndex);
memberState.getSelfId(), memberState.getRole(), memberState.currTerm(), dLedgerStore.getLedgerBeginIndex(), dLedgerStore.getLedgerEndIndex(), dLedgerStore.getCommittedIndex(), DLedgerJsonUtils.toJsonString(peerWaterMarksByTerm), lastAppliedIndex);
} else {
logger.info("[{}][{}] term={} ledgerBegin={} ledgerEnd={} committed={} watermarks={}",
memberState.getSelfId(), memberState.getRole(), memberState.currTerm(), dLedgerStore.getLedgerBeginIndex(), dLedgerStore.getLedgerEndIndex(), dLedgerStore.getCommittedIndex(), JSON.toJSONString(peerWaterMarksByTerm));
memberState.getSelfId(), memberState.getRole(), memberState.currTerm(), dLedgerStore.getLedgerBeginIndex(), dLedgerStore.getLedgerEndIndex(), dLedgerStore.getCommittedIndex(), DLedgerJsonUtils.toJsonString(peerWaterMarksByTerm));
}
lastPrintWatermarkTimeMs = System.currentTimeMillis();
}
Expand Down
4 changes: 2 additions & 2 deletions dledger/src/main/java/io/openmessaging/storage/dledger/DLedgerLeaderElector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@

package io.openmessaging.storage.dledger;

import com.alibaba.fastjson.JSON;
import io.openmessaging.storage.dledger.protocol.DLedgerResponseCode;
import io.openmessaging.storage.dledger.protocol.HeartBeatRequest;
import io.openmessaging.storage.dledger.protocol.HeartBeatResponse;
import io.openmessaging.storage.dledger.protocol.LeadershipTransferRequest;
import io.openmessaging.storage.dledger.protocol.LeadershipTransferResponse;
import io.openmessaging.storage.dledger.protocol.VoteRequest;
import io.openmessaging.storage.dledger.protocol.VoteResponse;
import io.openmessaging.storage.dledger.utils.DLedgerJsonUtils;
import io.openmessaging.storage.dledger.utils.DLedgerUtils;

import java.sql.Timestamp;
Expand Down Expand Up @@ -448,7 +448,7 @@ private void maintainAsCandidate() throws Exception {
if (ex != null) {
throw ex;
}
LOGGER.info("[{}][GetVoteResponse] {}", memberState.getSelfId(), JSON.toJSONString(x));
LOGGER.info("[{}][GetVoteResponse] {}", memberState.getSelfId(), DLedgerJsonUtils.toJsonString(x));
if (x.getVoteResult() != VoteResponse.RESULT.UNKNOWN) {
validNum.incrementAndGet();
}
Expand Down
Loading