You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ratis.apache.org by ru...@apache.org on 2020/12/11 07:18:34 UTC
[incubator-ratis] branch master updated: RATIS-1230. Move out the
LogEntryProto methods from ServerProtoUtils. (#348)
This is an automated email from the ASF dual-hosted git repository.
runzhiwang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ratis.git
The following commit(s) were added to refs/heads/master by this push:
new 544d0e6 RATIS-1230. Move out the LogEntryProto methods from ServerProtoUtils. (#348)
544d0e6 is described below
commit 544d0e6ec9c7d7b0fa0081a8e00f16fac278c109
Author: Tsz-Wo Nicholas Sze <sz...@apache.org>
AuthorDate: Fri Dec 11 15:18:24 2020 +0800
RATIS-1230. Move out the LogEntryProto methods from ServerProtoUtils. (#348)
---
.../apache/ratis/server/impl/LeaderStateImpl.java | 5 +-
.../apache/ratis/server/impl/RaftServerImpl.java | 5 +-
.../apache/ratis/server/impl/ServerProtoUtils.java | 72 +----------------
.../ratis/server/impl/StateMachineUpdater.java | 3 +-
.../apache/ratis/server/raftlog/LogProtoUtils.java | 91 ++++++++++++++++++++++
.../org/apache/ratis/server/raftlog/RaftLog.java | 8 +-
.../server/raftlog/segmented/SegmentedRaftLog.java | 9 ++-
.../raftlog/segmented/SegmentedRaftLogCache.java | 3 +-
.../raftlog/segmented/SegmentedRaftLogWorker.java | 5 +-
.../statemachine/impl/TransactionContextImpl.java | 3 +-
.../java/org/apache/ratis/LogAppenderTests.java | 5 +-
.../test/java/org/apache/ratis/RaftTestUtil.java | 3 +-
.../server/impl/RaftReconfigurationBaseTest.java | 3 +-
.../ratis/server/storage/RaftStorageTestUtils.java | 5 +-
.../statemachine/SimpleStateMachine4Testing.java | 4 +-
.../ratis/datastream/DataStreamTestUtils.java | 4 +-
.../apache/ratis/server/ServerRestartTests.java | 7 +-
.../raftlog/segmented/TestCacheEviction.java | 4 +-
.../server/raftlog/segmented/TestLogSegment.java | 18 ++---
.../raftlog/segmented/TestRaftLogReadWrite.java | 12 +--
.../raftlog/segmented/TestSegmentedRaftLog.java | 6 +-
.../segmented/TestSegmentedRaftLogCache.java | 8 +-
.../java/org/apache/ratis/tools/ParseRatisLog.java | 4 +-
23 files changed, 159 insertions(+), 128 deletions(-)
diff --git a/ratis-server/src/main/java/org/apache/ratis/server/impl/LeaderStateImpl.java b/ratis-server/src/main/java/org/apache/ratis/server/impl/LeaderStateImpl.java
index 5441408..ccb033f 100644
--- a/ratis-server/src/main/java/org/apache/ratis/server/impl/LeaderStateImpl.java
+++ b/ratis-server/src/main/java/org/apache/ratis/server/impl/LeaderStateImpl.java
@@ -39,6 +39,7 @@ import org.apache.ratis.server.leader.LogAppender;
import org.apache.ratis.server.metrics.LogAppenderMetrics;
import org.apache.ratis.server.metrics.RaftServerMetrics;
import org.apache.ratis.server.protocol.TermIndex;
+import org.apache.ratis.server.raftlog.LogProtoUtils;
import org.apache.ratis.server.raftlog.RaftLog;
import org.apache.ratis.server.raftlog.RaftLogIOException;
import org.apache.ratis.statemachine.TransactionContext;
@@ -279,7 +280,7 @@ class LeaderStateImpl implements LeaderState {
// In the beginning of the new term, replicate a conf entry in order
// to finally commit entries in the previous term.
// Also this message can help identify the last committed index and the conf.
- final LogEntryProto placeHolder = ServerProtoUtils.toLogEntryProto(
+ final LogEntryProto placeHolder = LogProtoUtils.toLogEntryProto(
server.getRaftConf(), server.getState().getCurrentTerm(), raftLog.getNextIndex());
CodeInjectionForTesting.execute(APPEND_PLACEHOLDER,
server.getId().toString(), null);
@@ -369,7 +370,7 @@ class LeaderStateImpl implements LeaderState {
PendingRequest addPendingRequest(PendingRequests.Permit permit, RaftClientRequest request, TransactionContext entry) {
if (LOG.isDebugEnabled()) {
LOG.debug("{}: addPendingRequest at {}, entry={}", this, request,
- ServerProtoUtils.toLogEntryString(entry.getLogEntry()));
+ LogProtoUtils.toLogEntryString(entry.getLogEntry()));
}
return pendingRequests.add(permit, request, entry);
}
diff --git a/ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java b/ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java
index 2a1f536..a796fc0 100644
--- a/ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java
+++ b/ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java
@@ -48,6 +48,7 @@ import org.apache.ratis.server.metrics.RaftServerMetrics;
import org.apache.ratis.server.protocol.RaftServerAsynchronousProtocol;
import org.apache.ratis.server.protocol.RaftServerProtocol;
import org.apache.ratis.server.protocol.TermIndex;
+import org.apache.ratis.server.raftlog.LogProtoUtils;
import org.apache.ratis.server.raftlog.RaftLog;
import org.apache.ratis.server.storage.RaftStorage;
import org.apache.ratis.server.storage.RaftStorageDirectory;
@@ -1121,7 +1122,7 @@ class RaftServerImpl implements RaftServer.Division,
() -> getMemberId() + ": receive appendEntries(" + leaderId + ", " + leaderTerm + ", "
+ previous + ", " + leaderCommit + ", " + initializing
+ ", commits" + ProtoUtils.toString(commitInfos)
- + ", entries: " + ServerProtoUtils.toString(entries));
+ + ", entries: " + LogProtoUtils.toLogEntryStrings(entries));
final long currentTerm;
final long followerCommit = state.getLog().getLastCommittedIndex();
@@ -1557,7 +1558,7 @@ class RaftServerImpl implements RaftServer.Division,
return replyPendingRequest(next, stateMachineFuture);
} catch (Exception e) {
LOG.error("{}: applyTransaction failed for index:{} proto:{}",
- getMemberId(), next.getIndex(), ServerProtoUtils.toString(next), e);
+ getMemberId(), next.getIndex(), LogProtoUtils.toLogEntryString(next), e);
throw e;
}
}
diff --git a/ratis-server/src/main/java/org/apache/ratis/server/impl/ServerProtoUtils.java b/ratis-server/src/main/java/org/apache/ratis/server/impl/ServerProtoUtils.java
index 10049d2..a2ac071 100644
--- a/ratis-server/src/main/java/org/apache/ratis/server/impl/ServerProtoUtils.java
+++ b/ratis-server/src/main/java/org/apache/ratis/server/impl/ServerProtoUtils.java
@@ -27,16 +27,15 @@ import org.apache.ratis.protocol.RaftPeer;
import org.apache.ratis.protocol.RaftPeerId;
import org.apache.ratis.server.RaftConfiguration;
import org.apache.ratis.server.protocol.TermIndex;
+import org.apache.ratis.server.raftlog.LogProtoUtils;
import org.apache.ratis.thirdparty.com.google.protobuf.ByteString;
import org.apache.ratis.util.Preconditions;
import org.apache.ratis.util.ProtoUtils;
-import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.Optional;
import java.util.function.Function;
-import java.util.stream.Collectors;
/** Server proto utilities for internal use. */
public interface ServerProtoUtils {
@@ -64,10 +63,6 @@ public interface ServerProtoUtils {
return TermIndex.toString(proto.getTerm(), proto.getIndex());
}
- static String toLogEntryString(LogEntryProto entry) {
- return toLogEntryString(entry, null);
- }
-
static String toStateMachineLogEntryString(StateMachineLogEntryProto smLog,
Function<StateMachineLogEntryProto, String> function) {
final ByteString clientId = smLog.getClientId();
@@ -81,34 +76,9 @@ public interface ServerProtoUtils {
return callIdString + smString;
}
-
- static String toLogEntryString(LogEntryProto entry,
- Function<StateMachineLogEntryProto, String> function) {
- if (entry == null) {
- return null;
- }
- final String s;
- if (entry.hasStateMachineLogEntry()) {
- s = ", " + toStateMachineLogEntryString(entry.getStateMachineLogEntry(), function);
- } else if (entry.hasMetadataEntry()) {
- final MetadataProto metadata = entry.getMetadataEntry();
- s = "(c:" + metadata.getCommitIndex() + ")";
- } else {
- s = "";
- }
- return toTermIndexString(entry) + ", " + entry.getLogEntryBodyCase() + s;
- }
-
- static String toString(LogEntryProto... entries) {
- return entries == null? "null"
- : entries.length == 0 ? "[]"
- : entries.length == 1? toLogEntryString(entries[0])
- : "" + Arrays.stream(entries).map(ServerProtoUtils::toLogEntryString)
- .collect(Collectors.toList());
- }
static String toShortString(List<LogEntryProto> entries) {
return entries.size() == 0? "<empty>"
- : "size=" + entries.size() + ", first=" + toLogEntryString(entries.get(0));
+ : "size=" + entries.size() + ", first=" + LogProtoUtils.toLogEntryString(entries.get(0));
}
static String toString(AppendEntriesRequestProto proto) {
if (proto == null) {
@@ -174,12 +144,6 @@ public interface ServerProtoUtils {
return ProtoUtils.toString(proto.getServerReply()) + "-t" + proto.getTerm() + "," + proto.getResult() + s;
}
- static RaftConfigurationProto.Builder toRaftConfigurationProto(RaftConfiguration conf) {
- return RaftConfigurationProto.newBuilder()
- .addAllPeers(ProtoUtils.toRaftPeerProtos(conf.getCurrentPeers()))
- .addAllOldPeers(ProtoUtils.toRaftPeerProtos(conf.getPreviousPeers()));
- }
-
static RaftConfigurationImpl toRaftConfiguration(LogEntryProto entry) {
Preconditions.assertTrue(entry.hasConfigurationEntry());
final RaftConfigurationProto proto = entry.getConfigurationEntry();
@@ -192,34 +156,6 @@ public interface ServerProtoUtils {
return b.build();
}
- static LogEntryProto toLogEntryProto(RaftConfiguration conf, Long term, long index) {
- final LogEntryProto.Builder b = LogEntryProto.newBuilder();
- Optional.ofNullable(term).ifPresent(b::setTerm);
- return b.setIndex(index)
- .setConfigurationEntry(toRaftConfigurationProto(conf))
- .build();
- }
-
- static LogEntryProto toLogEntryProto(StateMachineLogEntryProto smLog, long term, long index) {
- return LogEntryProto.newBuilder()
- .setTerm(term)
- .setIndex(index)
- .setStateMachineLogEntry(smLog)
- .build();
- }
-
- static LogEntryProto toLogEntryProto(long commitIndex, long term, long index) {
- return LogEntryProto.newBuilder()
- .setTerm(term)
- .setIndex(index)
- .setMetadataEntry(toMetadataEntryBuilder(commitIndex))
- .build();
- }
-
- static MetadataProto.Builder toMetadataEntryBuilder(long commitIndex) {
- return MetadataProto.newBuilder().setCommitIndex(commitIndex);
- }
-
static StateMachineEntryProto.Builder toStateMachineEntryProtoBuilder(ByteString stateMachineData) {
return StateMachineEntryProto.newBuilder().setStateMachineData(stateMachineData);
}
@@ -395,7 +331,7 @@ public interface ServerProtoUtils {
.setTotalSize(totalSize)
.setDone(done);
// term is not going to used by installSnapshot to update the RaftConfiguration
- final LogEntryProto confLogEntryProto = toLogEntryProto(raftConfiguration, null,
+ final LogEntryProto confLogEntryProto = LogProtoUtils.toLogEntryProto(raftConfiguration, null,
((RaftConfigurationImpl)raftConfiguration).getLogEntryIndex());
return InstallSnapshotRequestProto.newBuilder()
.setServerRequest(toRaftRpcRequestProtoBuilder(requestorId, replyId))
@@ -412,7 +348,7 @@ public interface ServerProtoUtils {
InstallSnapshotRequestProto.NotificationProto.newBuilder()
.setFirstAvailableTermIndex(toTermIndexProto(firstAvailable));
// term is not going to used by installSnapshot to update the RaftConfiguration
- final LogEntryProto confLogEntryProto = toLogEntryProto(raftConfiguration, null,
+ final LogEntryProto confLogEntryProto = LogProtoUtils.toLogEntryProto(raftConfiguration, null,
((RaftConfigurationImpl)raftConfiguration).getLogEntryIndex());
return InstallSnapshotRequestProto.newBuilder()
.setServerRequest(toRaftRpcRequestProtoBuilder(requestorId, replyId))
diff --git a/ratis-server/src/main/java/org/apache/ratis/server/impl/StateMachineUpdater.java b/ratis-server/src/main/java/org/apache/ratis/server/impl/StateMachineUpdater.java
index 671f736..e0c7f66 100644
--- a/ratis-server/src/main/java/org/apache/ratis/server/impl/StateMachineUpdater.java
+++ b/ratis-server/src/main/java/org/apache/ratis/server/impl/StateMachineUpdater.java
@@ -22,6 +22,7 @@ import org.apache.ratis.proto.RaftProtos.CommitInfoProto;
import org.apache.ratis.protocol.Message;
import org.apache.ratis.protocol.exceptions.StateMachineException;
import org.apache.ratis.server.RaftServerConfigKeys;
+import org.apache.ratis.server.raftlog.LogProtoUtils;
import org.apache.ratis.server.raftlog.RaftLog;
import org.apache.ratis.proto.RaftProtos.LogEntryProto;
import org.apache.ratis.server.raftlog.RaftLogIOException;
@@ -223,7 +224,7 @@ class StateMachineUpdater implements Runnable {
final LogEntryProto next = raftLog.get(nextIndex);
if (next != null) {
if (LOG.isTraceEnabled()) {
- LOG.trace("{}: applying nextIndex={}, nextLog={}", this, nextIndex, ServerProtoUtils.toString(next));
+ LOG.trace("{}: applying nextIndex={}, nextLog={}", this, nextIndex, LogProtoUtils.toLogEntryString(next));
} else {
LOG.debug("{}: applying nextIndex={}", this, nextIndex);
}
diff --git a/ratis-server/src/main/java/org/apache/ratis/server/raftlog/LogProtoUtils.java b/ratis-server/src/main/java/org/apache/ratis/server/raftlog/LogProtoUtils.java
new file mode 100644
index 0000000..a3cd5cf
--- /dev/null
+++ b/ratis-server/src/main/java/org/apache/ratis/server/raftlog/LogProtoUtils.java
@@ -0,0 +1,91 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.ratis.server.raftlog;
+
+import org.apache.ratis.proto.RaftProtos.*;
+import org.apache.ratis.server.RaftConfiguration;
+import org.apache.ratis.server.impl.ServerProtoUtils;
+import org.apache.ratis.server.protocol.TermIndex;
+import org.apache.ratis.util.ProtoUtils;
+
+import java.util.Arrays;
+import java.util.Optional;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/** Log proto utilities. */
+public final class LogProtoUtils {
+ private LogProtoUtils() {}
+
+ public static String toLogEntryString(LogEntryProto entry, Function<StateMachineLogEntryProto, String> function) {
+ if (entry == null) {
+ return null;
+ }
+ final String s;
+ if (entry.hasStateMachineLogEntry()) {
+ s = ", " + ServerProtoUtils.toStateMachineLogEntryString(entry.getStateMachineLogEntry(), function);
+ } else if (entry.hasMetadataEntry()) {
+ final MetadataProto metadata = entry.getMetadataEntry();
+ s = "(c:" + metadata.getCommitIndex() + ")";
+ } else {
+ s = "";
+ }
+ return TermIndex.toString(entry.getTerm(), entry.getIndex()) + ", " + entry.getLogEntryBodyCase() + s;
+ }
+
+ public static String toLogEntryString(LogEntryProto entry) {
+ return toLogEntryString(entry, null);
+ }
+
+ public static String toLogEntryStrings(LogEntryProto... entries) {
+ return entries == null ? null
+ : entries.length == 0 ? "[]"
+ : entries.length == 1 ? toLogEntryString(entries[0])
+ : "" + Arrays.stream(entries).map(LogProtoUtils::toLogEntryString).collect(Collectors.toList());
+ }
+
+ public static LogEntryProto toLogEntryProto(RaftConfiguration conf, Long term, long index) {
+ final LogEntryProto.Builder b = LogEntryProto.newBuilder();
+ Optional.ofNullable(term).ifPresent(b::setTerm);
+ return b.setIndex(index)
+ .setConfigurationEntry(toRaftConfigurationProtoBuilder(conf))
+ .build();
+ }
+
+ private static RaftConfigurationProto.Builder toRaftConfigurationProtoBuilder(RaftConfiguration conf) {
+ return RaftConfigurationProto.newBuilder()
+ .addAllPeers(ProtoUtils.toRaftPeerProtos(conf.getCurrentPeers()))
+ .addAllOldPeers(ProtoUtils.toRaftPeerProtos(conf.getPreviousPeers()));
+ }
+
+ public static LogEntryProto toLogEntryProto(StateMachineLogEntryProto proto, long term, long index) {
+ return LogEntryProto.newBuilder()
+ .setTerm(term)
+ .setIndex(index)
+ .setStateMachineLogEntry(proto)
+ .build();
+ }
+
+ public static LogEntryProto toLogEntryProto(long commitIndex, long term, long index) {
+ return LogEntryProto.newBuilder()
+ .setTerm(term)
+ .setIndex(index)
+ .setMetadataEntry(MetadataProto.newBuilder().setCommitIndex(commitIndex))
+ .build();
+ }
+}
diff --git a/ratis-server/src/main/java/org/apache/ratis/server/raftlog/RaftLog.java b/ratis-server/src/main/java/org/apache/ratis/server/raftlog/RaftLog.java
index 1a5fcb9..dd2a27a 100644
--- a/ratis-server/src/main/java/org/apache/ratis/server/raftlog/RaftLog.java
+++ b/ratis-server/src/main/java/org/apache/ratis/server/raftlog/RaftLog.java
@@ -246,7 +246,7 @@ public abstract class RaftLog implements RaftLogSequentialOps, Closeable {
final long nextIndex;
try(AutoCloseableLock writeLock = writeLock()) {
nextIndex = getNextIndex();
- entry = ServerProtoUtils.toLogEntryProto(newCommitIndex, term, nextIndex);
+ entry = LogProtoUtils.toLogEntryProto(newCommitIndex, term, nextIndex);
appendEntry(entry);
}
lastMetadataEntry = entry;
@@ -282,9 +282,7 @@ public abstract class RaftLog implements RaftLogSequentialOps, Closeable {
checkLogState();
try(AutoCloseableLock writeLock = writeLock()) {
final long nextIndex = getNextIndex();
- final LogEntryProto e = ServerProtoUtils.toLogEntryProto(newConf, term,
- nextIndex);
- appendEntry(e);
+ appendEntry(LogProtoUtils.toLogEntryProto(newConf, term, nextIndex));
return nextIndex;
}
}
@@ -552,6 +550,6 @@ public abstract class RaftLog implements RaftLogSequentialOps, Closeable {
}
public String toLogEntryString(LogEntryProto logEntry) {
- return ServerProtoUtils.toLogEntryString(logEntry);
+ return LogProtoUtils.toLogEntryString(logEntry);
}
}
diff --git a/ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLog.java b/ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLog.java
index 15c8718..d37cccf 100644
--- a/ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLog.java
+++ b/ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLog.java
@@ -24,6 +24,7 @@ import org.apache.ratis.server.RaftServer;
import org.apache.ratis.server.RaftServerConfigKeys;
import org.apache.ratis.server.impl.ServerProtoUtils;
import org.apache.ratis.server.protocol.TermIndex;
+import org.apache.ratis.server.raftlog.LogProtoUtils;
import org.apache.ratis.server.raftlog.RaftLog;
import org.apache.ratis.server.raftlog.RaftLogIOException;
import org.apache.ratis.server.storage.RaftStorage;
@@ -297,7 +298,7 @@ public class SegmentedRaftLog extends RaftLog {
return new EntryWithData(entry, future);
} catch (Exception e) {
final String err = getName() + ": Failed readStateMachineData for " +
- ServerProtoUtils.toLogEntryString(entry);
+ LogProtoUtils.toLogEntryString(entry);
LOG.error(err, e);
throw new RaftLogIOException(err, JavaUtils.unwrapCompletionException(e));
}
@@ -371,7 +372,7 @@ public class SegmentedRaftLog extends RaftLog {
final Timer.Context context = getRaftLogMetrics().getRaftLogAppendEntryTimer().time();
checkLogState();
if (LOG.isTraceEnabled()) {
- LOG.trace("{}: appendEntry {}", getName(), ServerProtoUtils.toLogEntryString(entry));
+ LOG.trace("{}: appendEntry {}", getName(), LogProtoUtils.toLogEntryString(entry));
}
try(AutoCloseableLock writeLock = writeLock()) {
validateLogEntry(entry);
@@ -410,7 +411,7 @@ public class SegmentedRaftLog extends RaftLog {
}
return writeFuture;
} catch (Exception e) {
- LOG.error("{}: Failed to append {}", getName(), ServerProtoUtils.toLogEntryString(entry), e);
+ LOG.error("{}: Failed to append {}", getName(), LogProtoUtils.toLogEntryString(entry), e);
throw e;
} finally {
context.stop();
@@ -531,6 +532,6 @@ public class SegmentedRaftLog extends RaftLog {
@Override
public String toLogEntryString(LogEntryProto logEntry) {
- return ServerProtoUtils.toLogEntryString(logEntry, stateMachine::toStateMachineLogEntryString);
+ return LogProtoUtils.toLogEntryString(logEntry, stateMachine::toStateMachineLogEntryString);
}
}
diff --git a/ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLogCache.java b/ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLogCache.java
index d32d994..443bd1a 100644
--- a/ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLogCache.java
+++ b/ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLogCache.java
@@ -23,6 +23,7 @@ import org.apache.ratis.server.RaftServerConfigKeys;
import org.apache.ratis.server.impl.ServerProtoUtils;
import org.apache.ratis.server.metrics.RaftLogMetrics;
import org.apache.ratis.server.protocol.TermIndex;
+import org.apache.ratis.server.raftlog.LogProtoUtils;
import org.apache.ratis.server.raftlog.RaftLog;
import org.apache.ratis.server.storage.RaftStorage;
import org.apache.ratis.server.raftlog.segmented.CacheInvalidationPolicy.CacheInvalidationPolicyDefault;
@@ -597,7 +598,7 @@ public class SegmentedRaftLogCache {
LOG.trace("{}: truncate to {}, arrayIndex={}, ti={}, storedEntry={}, entries={}",
name, truncateIndex, arrayIndex,
ServerProtoUtils.toTermIndex(entries[arrayIndex]), storedEntry,
- ServerProtoUtils.toString(entries));
+ LogProtoUtils.toLogEntryStrings(entries));
}
// fail all requests starting at truncateIndex
diff --git a/ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLogWorker.java b/ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLogWorker.java
index d7f7d35..9c99f7d 100644
--- a/ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLogWorker.java
+++ b/ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLogWorker.java
@@ -28,6 +28,7 @@ import org.apache.ratis.server.RaftServer;
import org.apache.ratis.server.RaftServerConfigKeys;
import org.apache.ratis.server.impl.ServerProtoUtils;
import org.apache.ratis.server.metrics.RaftLogMetrics;
+import org.apache.ratis.server.raftlog.LogProtoUtils;
import org.apache.ratis.server.raftlog.RaftLog;
import org.apache.ratis.server.raftlog.RaftLogIOException;
import org.apache.ratis.server.raftlog.RaftLogIndex;
@@ -470,7 +471,7 @@ class SegmentedRaftLogWorker {
this.stateMachineFuture = stateMachine.data().write(entry);
} catch (Exception e) {
LOG.error(name + ": writeStateMachineData failed for index " + entry.getIndex()
- + ", entry=" + ServerProtoUtils.toLogEntryString(entry, stateMachine::toStateMachineLogEntryString), e);
+ + ", entry=" + LogProtoUtils.toLogEntryString(entry, stateMachine::toStateMachineLogEntryString), e);
throw e;
}
}
@@ -525,7 +526,7 @@ class SegmentedRaftLogWorker {
@Override
public String toString() {
- return super.toString() + ": " + ServerProtoUtils.toLogEntryString(
+ return super.toString() + ": " + LogProtoUtils.toLogEntryString(
entry, stateMachine == null? null: stateMachine::toStateMachineLogEntryString);
}
}
diff --git a/ratis-server/src/main/java/org/apache/ratis/statemachine/impl/TransactionContextImpl.java b/ratis-server/src/main/java/org/apache/ratis/statemachine/impl/TransactionContextImpl.java
index 1cf9148..86206de 100644
--- a/ratis-server/src/main/java/org/apache/ratis/statemachine/impl/TransactionContextImpl.java
+++ b/ratis-server/src/main/java/org/apache/ratis/statemachine/impl/TransactionContextImpl.java
@@ -22,6 +22,7 @@ import org.apache.ratis.proto.RaftProtos.RaftPeerRole;
import org.apache.ratis.proto.RaftProtos.StateMachineLogEntryProto;
import org.apache.ratis.protocol.RaftClientRequest;
import org.apache.ratis.server.impl.ServerProtoUtils;
+import org.apache.ratis.server.raftlog.LogProtoUtils;
import org.apache.ratis.statemachine.StateMachine;
import org.apache.ratis.statemachine.TransactionContext;
import org.apache.ratis.util.Preconditions;
@@ -135,7 +136,7 @@ public class TransactionContextImpl implements TransactionContext {
Preconditions.assertTrue(serverRole == RaftPeerRole.LEADER);
Preconditions.assertNull(logEntry, "logEntry");
Objects.requireNonNull(smLogEntryProto, "smLogEntryProto == null");
- return logEntry = ServerProtoUtils.toLogEntryProto(smLogEntryProto, term, index);
+ return logEntry = LogProtoUtils.toLogEntryProto(smLogEntryProto, term, index);
}
@Override
diff --git a/ratis-server/src/test/java/org/apache/ratis/LogAppenderTests.java b/ratis-server/src/test/java/org/apache/ratis/LogAppenderTests.java
index 02b46c9..cae668c 100644
--- a/ratis-server/src/test/java/org/apache/ratis/LogAppenderTests.java
+++ b/ratis-server/src/test/java/org/apache/ratis/LogAppenderTests.java
@@ -33,8 +33,7 @@ import org.apache.ratis.server.RaftServerConfigKeys;
import org.apache.ratis.server.leader.LogAppender;
import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.server.metrics.RaftServerMetrics;
-import org.apache.ratis.server.impl.RaftServerTestUtil;
-import org.apache.ratis.server.impl.ServerProtoUtils;
+import org.apache.ratis.server.raftlog.LogProtoUtils;
import org.apache.ratis.server.raftlog.RaftLog;
import org.apache.ratis.statemachine.SimpleStateMachine4Testing;
import org.apache.ratis.statemachine.StateMachine;
@@ -215,7 +214,7 @@ public abstract class LogAppenderTests<CLUSTER extends MiniRaftCluster>
Assert.assertEquals(6 * numMsgs * numClients, counts.get(LogEntryBodyCase.STATEMACHINELOGENTRY).get());
final LogEntryProto last = RaftTestUtil.getLastEntry(LogEntryBodyCase.STATEMACHINELOGENTRY, leaderLog);
- LOG.info("last = " + ServerProtoUtils.toLogEntryString(last));
+ LOG.info("last = {}", LogProtoUtils.toLogEntryString(last));
Assert.assertNotNull(last);
Assert.assertTrue(last.getIndex() <= leader.getInfo().getLastAppliedIndex());
}
diff --git a/ratis-server/src/test/java/org/apache/ratis/RaftTestUtil.java b/ratis-server/src/test/java/org/apache/ratis/RaftTestUtil.java
index fe924e9..de3486d 100644
--- a/ratis-server/src/test/java/org/apache/ratis/RaftTestUtil.java
+++ b/ratis-server/src/test/java/org/apache/ratis/RaftTestUtil.java
@@ -33,6 +33,7 @@ import org.apache.ratis.server.impl.DelayLocalExecutionInjection;
import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.server.impl.ServerProtoUtils;
import org.apache.ratis.server.protocol.TermIndex;
+import org.apache.ratis.server.raftlog.LogProtoUtils;
import org.apache.ratis.server.raftlog.RaftLog;
import org.apache.ratis.thirdparty.com.google.common.base.Preconditions;
import org.apache.ratis.thirdparty.com.google.protobuf.ByteString;
@@ -255,7 +256,7 @@ public interface RaftTestUtil {
static List<LogEntryProto> getStateMachineLogEntries(RaftLog log) {
final List<LogEntryProto> entries = new ArrayList<>();
for (LogEntryProto e : getLogEntryProtos(log)) {
- final String s = ServerProtoUtils.toString(e);
+ final String s = LogProtoUtils.toLogEntryString(e);
if (e.hasStateMachineLogEntry()) {
LOG.info(s + ", " + e.getStateMachineLogEntry().toString().trim().replace("\n", ", "));
entries.add(e);
diff --git a/ratis-server/src/test/java/org/apache/ratis/server/impl/RaftReconfigurationBaseTest.java b/ratis-server/src/test/java/org/apache/ratis/server/impl/RaftReconfigurationBaseTest.java
index 9a9cc9b..8ee057e 100644
--- a/ratis-server/src/test/java/org/apache/ratis/server/impl/RaftReconfigurationBaseTest.java
+++ b/ratis-server/src/test/java/org/apache/ratis/server/impl/RaftReconfigurationBaseTest.java
@@ -38,6 +38,7 @@ import org.apache.ratis.server.RaftConfiguration;
import org.apache.ratis.server.RaftServer;
import org.apache.ratis.server.RaftServerConfigKeys;
import org.apache.ratis.server.impl.MiniRaftCluster.PeerChanges;
+import org.apache.ratis.server.raftlog.LogProtoUtils;
import org.apache.ratis.server.raftlog.RaftLog;
import org.apache.ratis.server.storage.RaftStorageTestUtils;
import org.apache.ratis.util.JavaUtils;
@@ -419,7 +420,7 @@ public abstract class RaftReconfigurationBaseTest<CLUSTER extends MiniRaftCluste
{
final RaftLog leaderLog = cluster.getLeader().getRaftLog();
for(LogEntryProto e : RaftTestUtil.getLogEntryProtos(leaderLog)) {
- LOG.info("{}", ServerProtoUtils.toLogEntryString(e));
+ LOG.info("{}", LogProtoUtils.toLogEntryString(e));
}
final long commitIndex = leaderLog.getLastCommittedIndex();
Assert.assertTrue("commitIndex = " + commitIndex + " > 2", commitIndex <= 2);
diff --git a/ratis-server/src/test/java/org/apache/ratis/server/storage/RaftStorageTestUtils.java b/ratis-server/src/test/java/org/apache/ratis/server/storage/RaftStorageTestUtils.java
index 67509e0..2214dc4 100644
--- a/ratis-server/src/test/java/org/apache/ratis/server/storage/RaftStorageTestUtils.java
+++ b/ratis-server/src/test/java/org/apache/ratis/server/storage/RaftStorageTestUtils.java
@@ -20,10 +20,9 @@ package org.apache.ratis.server.storage;
import static org.apache.ratis.server.metrics.RaftLogMetrics.RAFT_LOG_FLUSH_TIME;
import static org.apache.ratis.server.metrics.RaftLogMetrics.RATIS_LOG_WORKER_METRICS;
-import org.apache.ratis.protocol.RaftPeerId;
-import org.apache.ratis.server.impl.ServerProtoUtils;
import org.apache.ratis.metrics.RatisMetrics;
import org.apache.ratis.server.protocol.TermIndex;
+import org.apache.ratis.server.raftlog.LogProtoUtils;
import org.apache.ratis.server.raftlog.RaftLog;
import org.apache.ratis.server.raftlog.RaftLogIOException;
import org.apache.ratis.util.AutoCloseableLock;
@@ -66,7 +65,7 @@ public interface RaftStorageTestUtils {
b.append(i == committed? 'c': ' ');
b.append(String.format("%3d: ", i));
try {
- b.append(ServerProtoUtils.toLogEntryString(log.get(i)));
+ b.append(LogProtoUtils.toLogEntryString(log.get(i)));
} catch (RaftLogIOException e) {
b.append(e);
}
diff --git a/ratis-server/src/test/java/org/apache/ratis/statemachine/SimpleStateMachine4Testing.java b/ratis-server/src/test/java/org/apache/ratis/statemachine/SimpleStateMachine4Testing.java
index 6af26bf..b8882d5 100644
--- a/ratis-server/src/test/java/org/apache/ratis/statemachine/SimpleStateMachine4Testing.java
+++ b/ratis-server/src/test/java/org/apache/ratis/statemachine/SimpleStateMachine4Testing.java
@@ -30,8 +30,8 @@ import org.apache.ratis.protocol.RaftPeerId;
import org.apache.ratis.protocol.exceptions.StateMachineException;
import org.apache.ratis.server.RaftServer;
import org.apache.ratis.server.RaftServerConfigKeys;
-import org.apache.ratis.server.impl.ServerProtoUtils;
import org.apache.ratis.server.protocol.TermIndex;
+import org.apache.ratis.server.raftlog.LogProtoUtils;
import org.apache.ratis.server.raftlog.RaftLog;
import org.apache.ratis.server.raftlog.segmented.SegmentedRaftLogInputStream;
import org.apache.ratis.server.raftlog.segmented.SegmentedRaftLogOutputStream;
@@ -202,7 +202,7 @@ public class SimpleStateMachine4Testing extends BaseStateMachine {
dataMap.put(s, entry);
LOG.info("{}: put {}, {} -> {}", getId(), entry.getIndex(),
s.length() <= 10? s: s.substring(0, 10) + "...",
- ServerProtoUtils.toLogEntryString(entry));
+ LogProtoUtils.toLogEntryString(entry));
}
@Override
diff --git a/ratis-test/src/test/java/org/apache/ratis/datastream/DataStreamTestUtils.java b/ratis-test/src/test/java/org/apache/ratis/datastream/DataStreamTestUtils.java
index 51a028c..2de9332 100644
--- a/ratis-test/src/test/java/org/apache/ratis/datastream/DataStreamTestUtils.java
+++ b/ratis-test/src/test/java/org/apache/ratis/datastream/DataStreamTestUtils.java
@@ -36,8 +36,8 @@ import org.apache.ratis.protocol.RaftPeerId;
import org.apache.ratis.protocol.exceptions.AlreadyClosedException;
import org.apache.ratis.server.RaftServer;
import org.apache.ratis.server.impl.MiniRaftCluster;
-import org.apache.ratis.server.impl.ServerProtoUtils;
import org.apache.ratis.server.protocol.TermIndex;
+import org.apache.ratis.server.raftlog.LogProtoUtils;
import org.apache.ratis.server.raftlog.RaftLog;
import org.apache.ratis.statemachine.StateMachine.DataChannel;
import org.apache.ratis.statemachine.StateMachine.DataStream;
@@ -202,7 +202,7 @@ public interface DataStreamTestUtils {
@Override
public String toString() {
return JavaUtils.getClassSimpleName(getClass()) + ": writeRequest=" + writeRequest
- + ", logEntry=" + ServerProtoUtils.toString(logEntry);
+ + ", logEntry=" + LogProtoUtils.toLogEntryString(logEntry);
}
}
diff --git a/ratis-test/src/test/java/org/apache/ratis/server/ServerRestartTests.java b/ratis-test/src/test/java/org/apache/ratis/server/ServerRestartTests.java
index d1ac48c..8f1b1bf 100644
--- a/ratis-test/src/test/java/org/apache/ratis/server/ServerRestartTests.java
+++ b/ratis-test/src/test/java/org/apache/ratis/server/ServerRestartTests.java
@@ -30,9 +30,8 @@ import org.apache.ratis.protocol.Message;
import org.apache.ratis.protocol.RaftClientReply;
import org.apache.ratis.protocol.RaftPeerId;
import org.apache.ratis.protocol.exceptions.StateMachineException;
-import org.apache.ratis.server.impl.RaftServerTestUtil;
-import org.apache.ratis.server.impl.ServerProtoUtils;
import org.apache.ratis.server.protocol.TermIndex;
+import org.apache.ratis.server.raftlog.LogProtoUtils;
import org.apache.ratis.server.raftlog.RaftLog;
import org.apache.ratis.server.raftlog.RaftLogIOException;
import org.apache.ratis.server.raftlog.segmented.SegmentedRaftLogFormat;
@@ -264,11 +263,11 @@ public abstract class ServerRestartTests<CLUSTER extends MiniRaftCluster>
final long lastIndex = leaderLog.getLastEntryTermIndex().getIndex();
LOG.info("{}: leader lastIndex={}", leaderId, lastIndex);
final LogEntryProto lastEntry = leaderLog.get(lastIndex);
- LOG.info("{}: leader lastEntry entry[{}] = {}", leaderId, lastIndex, ServerProtoUtils.toLogEntryString(lastEntry));
+ LOG.info("{}: leader lastEntry entry[{}] = {}", leaderId, lastIndex, LogProtoUtils.toLogEntryString(lastEntry));
final long loggedCommitIndex = lastEntry.getMetadataEntry().getCommitIndex();
final LogEntryProto lastCommittedEntry = leaderLog.get(loggedCommitIndex);
LOG.info("{}: leader lastCommittedEntry = entry[{}] = {}",
- leaderId, loggedCommitIndex, ServerProtoUtils.toLogEntryString(lastCommittedEntry));
+ leaderId, loggedCommitIndex, LogProtoUtils.toLogEntryString(lastCommittedEntry));
final SimpleStateMachine4Testing leaderStateMachine = SimpleStateMachine4Testing.get(leader);
final TermIndex lastAppliedTermIndex = leaderStateMachine.getLastAppliedTermIndex();
diff --git a/ratis-test/src/test/java/org/apache/ratis/server/raftlog/segmented/TestCacheEviction.java b/ratis-test/src/test/java/org/apache/ratis/server/raftlog/segmented/TestCacheEviction.java
index a7f23fd..a1e18a8 100644
--- a/ratis-test/src/test/java/org/apache/ratis/server/raftlog/segmented/TestCacheEviction.java
+++ b/ratis-test/src/test/java/org/apache/ratis/server/raftlog/segmented/TestCacheEviction.java
@@ -28,7 +28,7 @@ import org.apache.ratis.server.DivisionInfo;
import org.apache.ratis.server.RaftServerConfigKeys;
import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.server.impl.RaftServerTestUtil;
-import org.apache.ratis.server.impl.ServerProtoUtils;
+import org.apache.ratis.server.raftlog.LogProtoUtils;
import org.apache.ratis.server.raftlog.RaftLog;
import org.apache.ratis.server.raftlog.segmented.CacheInvalidationPolicy.CacheInvalidationPolicyDefault;
import org.apache.ratis.server.raftlog.segmented.SegmentedRaftLogCache.LogSegmentList;
@@ -195,7 +195,7 @@ public class TestCacheEviction extends BaseTest {
for (SegmentRange range : slist) {
for (long index = range.start; index <= range.end; index++) {
SimpleOperation m = new SimpleOperation(new String(new byte[1024]));
- eList.add(ServerProtoUtils.toLogEntryProto(m.getLogEntryContent(), range.term, index));
+ eList.add(LogProtoUtils.toLogEntryProto(m.getLogEntryContent(), range.term, index));
}
}
return eList.toArray(new LogEntryProto[eList.size()]);
diff --git a/ratis-test/src/test/java/org/apache/ratis/server/raftlog/segmented/TestLogSegment.java b/ratis-test/src/test/java/org/apache/ratis/server/raftlog/segmented/TestLogSegment.java
index 5920f8b..81267cb 100644
--- a/ratis-test/src/test/java/org/apache/ratis/server/raftlog/segmented/TestLogSegment.java
+++ b/ratis-test/src/test/java/org/apache/ratis/server/raftlog/segmented/TestLogSegment.java
@@ -21,9 +21,9 @@ import org.apache.ratis.BaseTest;
import org.apache.ratis.RaftTestUtil.SimpleOperation;
import org.apache.ratis.conf.RaftProperties;
import org.apache.ratis.server.RaftServerConfigKeys;
-import org.apache.ratis.server.impl.ServerProtoUtils;
import org.apache.ratis.server.metrics.RaftLogMetrics;
import org.apache.ratis.server.protocol.TermIndex;
+import org.apache.ratis.server.raftlog.LogProtoUtils;
import org.apache.ratis.server.storage.RaftStorage;
import org.apache.ratis.server.storage.RaftStorageDirectory;
import org.apache.ratis.proto.RaftProtos.LogEntryProto;
@@ -98,7 +98,7 @@ public class TestLogSegment extends BaseTest {
segmentMaxSize, preallocatedSize, ByteBuffer.allocateDirect(bufferSize))) {
for (int i = 0; i < entries.length; i++) {
SimpleOperation op = new SimpleOperation("m" + i);
- entries[i] = ServerProtoUtils.toLogEntryProto(op.getLogEntryContent(), term, i + startIndex);
+ entries[i] = LogProtoUtils.toLogEntryProto(op.getLogEntryContent(), term, i + startIndex);
out.write(entries[i]);
}
}
@@ -200,7 +200,7 @@ public class TestLogSegment extends BaseTest {
int i = 0;
while (size < max) {
SimpleOperation op = new SimpleOperation("m" + i);
- LogEntryProto entry = ServerProtoUtils.toLogEntryProto(op.getLogEntryContent(), term, i++ + start);
+ LogEntryProto entry = LogProtoUtils.toLogEntryProto(op.getLogEntryContent(), term, i++ + start);
size += getEntrySize(entry, LogSegment.Op.WRITE_CACHE_WITHOUT_STATE_MACHINE_CACHE);
segment.appendToOpenSegment(entry, LogSegment.Op.WRITE_CACHE_WITHOUT_STATE_MACHINE_CACHE);
}
@@ -233,18 +233,18 @@ public class TestLogSegment extends BaseTest {
SimpleOperation op = new SimpleOperation("m");
final StateMachineLogEntryProto m = op.getLogEntryContent();
try {
- LogEntryProto entry = ServerProtoUtils.toLogEntryProto(m, 0, 1001);
+ LogEntryProto entry = LogProtoUtils.toLogEntryProto(m, 0, 1001);
segment.appendToOpenSegment(entry, LogSegment.Op.WRITE_CACHE_WITHOUT_STATE_MACHINE_CACHE);
Assert.fail("should fail since the entry's index needs to be 1000");
} catch (IllegalStateException e) {
// the exception is expected.
}
- LogEntryProto entry = ServerProtoUtils.toLogEntryProto(m, 0, 1000);
+ LogEntryProto entry = LogProtoUtils.toLogEntryProto(m, 0, 1000);
segment.appendToOpenSegment(entry, LogSegment.Op.WRITE_CACHE_WITHOUT_STATE_MACHINE_CACHE);
try {
- entry = ServerProtoUtils.toLogEntryProto(m, 0, 1002);
+ entry = LogProtoUtils.toLogEntryProto(m, 0, 1002);
segment.appendToOpenSegment(entry, LogSegment.Op.WRITE_CACHE_WITHOUT_STATE_MACHINE_CACHE);
Assert.fail("should fail since the entry's index needs to be 1001");
} catch (IllegalStateException e) {
@@ -258,7 +258,7 @@ public class TestLogSegment extends BaseTest {
final long start = 1000;
LogSegment segment = LogSegment.newOpenSegment(null, start, null);
for (int i = 0; i < 100; i++) {
- LogEntryProto entry = ServerProtoUtils.toLogEntryProto(
+ LogEntryProto entry = LogProtoUtils.toLogEntryProto(
new SimpleOperation("m" + i).getLogEntryContent(), term, i + start);
segment.appendToOpenSegment(entry, LogSegment.Op.WRITE_CACHE_WITHOUT_STATE_MACHINE_CACHE);
}
@@ -312,7 +312,7 @@ public class TestLogSegment extends BaseTest {
try (SegmentedRaftLogOutputStream out = new SegmentedRaftLogOutputStream(file, false,
1024, 1024, ByteBuffer.allocateDirect(bufferSize))) {
SimpleOperation op = new SimpleOperation(new String(content));
- LogEntryProto entry = ServerProtoUtils.toLogEntryProto(op.getLogEntryContent(), 0, 0);
+ LogEntryProto entry = LogProtoUtils.toLogEntryProto(op.getLogEntryContent(), 0, 0);
size = LogSegment.getEntrySize(entry, LogSegment.Op.WRITE_CACHE_WITHOUT_STATE_MACHINE_CACHE);
out.write(entry);
}
@@ -339,7 +339,7 @@ public class TestLogSegment extends BaseTest {
final byte[] content = new byte[1024];
Arrays.fill(content, (byte) 1);
SimpleOperation op = new SimpleOperation(new String(content));
- LogEntryProto entry = ServerProtoUtils.toLogEntryProto(op.getLogEntryContent(), 0, 0);
+ LogEntryProto entry = LogProtoUtils.toLogEntryProto(op.getLogEntryContent(), 0, 0);
final long entrySize = LogSegment.getEntrySize(entry, LogSegment.Op.WRITE_CACHE_WITHOUT_STATE_MACHINE_CACHE);
long totalSize = SegmentedRaftLogFormat.getHeaderLength();
diff --git a/ratis-test/src/test/java/org/apache/ratis/server/raftlog/segmented/TestRaftLogReadWrite.java b/ratis-test/src/test/java/org/apache/ratis/server/raftlog/segmented/TestRaftLogReadWrite.java
index 8237600..f543ed0 100644
--- a/ratis-test/src/test/java/org/apache/ratis/server/raftlog/segmented/TestRaftLogReadWrite.java
+++ b/ratis-test/src/test/java/org/apache/ratis/server/raftlog/segmented/TestRaftLogReadWrite.java
@@ -22,7 +22,7 @@ import org.apache.ratis.RaftTestUtil.SimpleOperation;
import org.apache.ratis.conf.RaftProperties;
import org.apache.ratis.protocol.exceptions.ChecksumException;
import org.apache.ratis.server.RaftServerConfigKeys;
-import org.apache.ratis.server.impl.ServerProtoUtils;
+import org.apache.ratis.server.raftlog.LogProtoUtils;
import org.apache.ratis.server.raftlog.RaftLog;
import org.apache.ratis.server.storage.RaftStorage;
import org.apache.ratis.server.storage.RaftStorageTestUtils;
@@ -89,7 +89,7 @@ public class TestRaftLogReadWrite extends BaseTest {
long size = 0;
for (int i = 0; i < entries.length; i++) {
SimpleOperation m = new SimpleOperation("m" + i);
- entries[i] = ServerProtoUtils.toLogEntryProto(m.getLogEntryContent(), 0, i);
+ entries[i] = LogProtoUtils.toLogEntryProto(m.getLogEntryContent(), 0, i);
final int s = entries[i].getSerializedSize();
size += CodedOutputStream.computeUInt32SizeNoTag(s) + s + 4;
out.write(entries[i]);
@@ -129,7 +129,7 @@ public class TestRaftLogReadWrite extends BaseTest {
segmentMaxSize, preallocatedSize, ByteBuffer.allocateDirect(bufferSize))) {
for (int i = 0; i < 100; i++) {
SimpleOperation m = new SimpleOperation("m" + i);
- entries[i] = ServerProtoUtils.toLogEntryProto(m.getLogEntryContent(), 0, i);
+ entries[i] = LogProtoUtils.toLogEntryProto(m.getLogEntryContent(), 0, i);
out.write(entries[i]);
}
}
@@ -138,7 +138,7 @@ public class TestRaftLogReadWrite extends BaseTest {
segmentMaxSize, preallocatedSize, ByteBuffer.allocateDirect(bufferSize))) {
for (int i = 100; i < 200; i++) {
SimpleOperation m = new SimpleOperation("m" + i);
- entries[i] = ServerProtoUtils.toLogEntryProto(m.getLogEntryContent(), 0, i);
+ entries[i] = LogProtoUtils.toLogEntryProto(m.getLogEntryContent(), 0, i);
out.write(entries[i]);
}
}
@@ -192,7 +192,7 @@ public class TestRaftLogReadWrite extends BaseTest {
16 * 1024 * 1024, 4 * 1024 * 1024, ByteBuffer.allocateDirect(bufferSize));
for (int i = 0; i < 10; i++) {
SimpleOperation m = new SimpleOperation("m" + i);
- entries[i] = ServerProtoUtils.toLogEntryProto(m.getLogEntryContent(), 0, i);
+ entries[i] = LogProtoUtils.toLogEntryProto(m.getLogEntryContent(), 0, i);
out.write(entries[i]);
}
out.flush();
@@ -238,7 +238,7 @@ public class TestRaftLogReadWrite extends BaseTest {
try (SegmentedRaftLogOutputStream out = new SegmentedRaftLogOutputStream(openSegment, false,
segmentMaxSize, preallocatedSize, ByteBuffer.allocateDirect(bufferSize))) {
for (int i = 0; i < 100; i++) {
- LogEntryProto entry = ServerProtoUtils.toLogEntryProto(
+ LogEntryProto entry = LogProtoUtils.toLogEntryProto(
new SimpleOperation("m" + i).getLogEntryContent(), 0, i);
out.write(entry);
}
diff --git a/ratis-test/src/test/java/org/apache/ratis/server/raftlog/segmented/TestSegmentedRaftLog.java b/ratis-test/src/test/java/org/apache/ratis/server/raftlog/segmented/TestSegmentedRaftLog.java
index 59557e9..8b4b77d 100644
--- a/ratis-test/src/test/java/org/apache/ratis/server/raftlog/segmented/TestSegmentedRaftLog.java
+++ b/ratis-test/src/test/java/org/apache/ratis/server/raftlog/segmented/TestSegmentedRaftLog.java
@@ -31,10 +31,10 @@ import org.apache.ratis.protocol.exceptions.TimeoutIOException;
import org.apache.ratis.server.RaftServerConfigKeys;
import org.apache.ratis.server.impl.RetryCacheTestUtil;
import org.apache.ratis.server.RetryCache;
-import org.apache.ratis.server.impl.ServerProtoUtils;
import org.apache.ratis.server.metrics.RaftLogMetrics;
import org.apache.ratis.server.protocol.TermIndex;
import org.apache.ratis.proto.RaftProtos.LogEntryProto;
+import org.apache.ratis.server.raftlog.LogProtoUtils;
import org.apache.ratis.server.raftlog.RaftLog;
import org.apache.ratis.server.storage.RaftStorage;
import org.apache.ratis.server.storage.RaftStorageTestUtils;
@@ -157,7 +157,7 @@ public class TestSegmentedRaftLog extends BaseTest {
segmentMaxSize, preallocatedSize, ByteBuffer.allocateDirect(bufferSize))) {
for (int i = 0; i < size; i++) {
SimpleOperation m = new SimpleOperation("m" + (i + range.start));
- entries[i] = ServerProtoUtils.toLogEntryProto(m.getLogEntryContent(), range.term, i + range.start);
+ entries[i] = LogProtoUtils.toLogEntryProto(m.getLogEntryContent(), range.term, i + range.start);
out.write(entries[i]);
}
}
@@ -241,7 +241,7 @@ public class TestSegmentedRaftLog extends BaseTest {
final SimpleOperation m = stringSupplier == null?
new SimpleOperation("m" + index, hasStataMachineData):
new SimpleOperation(stringSupplier.get(), hasStataMachineData);
- return ServerProtoUtils.toLogEntryProto(m.getLogEntryContent(), term, index);
+ return LogProtoUtils.toLogEntryProto(m.getLogEntryContent(), term, index);
}
/**
diff --git a/ratis-test/src/test/java/org/apache/ratis/server/raftlog/segmented/TestSegmentedRaftLogCache.java b/ratis-test/src/test/java/org/apache/ratis/server/raftlog/segmented/TestSegmentedRaftLogCache.java
index 30340ca..b35b442 100644
--- a/ratis-test/src/test/java/org/apache/ratis/server/raftlog/segmented/TestSegmentedRaftLogCache.java
+++ b/ratis-test/src/test/java/org/apache/ratis/server/raftlog/segmented/TestSegmentedRaftLogCache.java
@@ -26,9 +26,9 @@ import java.util.stream.IntStream;
import org.apache.ratis.RaftTestUtil.SimpleOperation;
import org.apache.ratis.conf.RaftProperties;
import org.apache.ratis.metrics.RatisMetricRegistry;
-import org.apache.ratis.server.impl.ServerProtoUtils;
import org.apache.ratis.server.metrics.RaftLogMetrics;
import org.apache.ratis.server.protocol.TermIndex;
+import org.apache.ratis.server.raftlog.LogProtoUtils;
import org.apache.ratis.server.raftlog.segmented.SegmentedRaftLogCache.TruncationSegments;
import org.apache.ratis.server.raftlog.segmented.LogSegment.LogRecord;
import org.apache.ratis.proto.RaftProtos.LogEntryProto;
@@ -60,7 +60,7 @@ public class TestSegmentedRaftLogCache {
LogSegment s = LogSegment.newOpenSegment(null, start, null);
for (long i = start; i <= end; i++) {
SimpleOperation m = new SimpleOperation("m" + i);
- LogEntryProto entry = ServerProtoUtils.toLogEntryProto(m.getLogEntryContent(), 0, i);
+ LogEntryProto entry = LogProtoUtils.toLogEntryProto(m.getLogEntryContent(), 0, i);
s.appendToOpenSegment(entry, LogSegment.Op.WRITE_CACHE_WITHOUT_STATE_MACHINE_CACHE);
}
if (!isOpen) {
@@ -151,7 +151,7 @@ public class TestSegmentedRaftLogCache {
final SimpleOperation m = new SimpleOperation("m");
try {
- LogEntryProto entry = ServerProtoUtils.toLogEntryProto(m.getLogEntryContent(), 0, 0);
+ LogEntryProto entry = LogProtoUtils.toLogEntryProto(m.getLogEntryContent(), 0, 0);
cache.appendEntry(entry, LogSegment.Op.WRITE_CACHE_WITHOUT_STATE_MACHINE_CACHE);
Assert.fail("the open segment is null");
} catch (IllegalStateException ignored) {
@@ -160,7 +160,7 @@ public class TestSegmentedRaftLogCache {
LogSegment openSegment = prepareLogSegment(100, 100, true);
cache.addSegment(openSegment);
for (long index = 101; index < 200; index++) {
- LogEntryProto entry = ServerProtoUtils.toLogEntryProto(m.getLogEntryContent(), 0, index);
+ LogEntryProto entry = LogProtoUtils.toLogEntryProto(m.getLogEntryContent(), 0, index);
cache.appendEntry(entry, LogSegment.Op.WRITE_CACHE_WITHOUT_STATE_MACHINE_CACHE);
}
diff --git a/ratis-tools/src/main/java/org/apache/ratis/tools/ParseRatisLog.java b/ratis-tools/src/main/java/org/apache/ratis/tools/ParseRatisLog.java
index eddbaa7..e6bc176 100644
--- a/ratis-tools/src/main/java/org/apache/ratis/tools/ParseRatisLog.java
+++ b/ratis-tools/src/main/java/org/apache/ratis/tools/ParseRatisLog.java
@@ -21,7 +21,7 @@ package org.apache.ratis.tools;
import org.apache.ratis.proto.RaftProtos.StateMachineLogEntryProto;
import org.apache.ratis.proto.RaftProtos.LogEntryProto;
import org.apache.ratis.server.RaftServerConfigKeys;
-import org.apache.ratis.server.impl.ServerProtoUtils;
+import org.apache.ratis.server.raftlog.LogProtoUtils;
import org.apache.ratis.server.raftlog.segmented.LogSegment;
import org.apache.ratis.server.storage.RaftStorageDirectory;
@@ -78,7 +78,7 @@ public final class ParseRatisLog {
numInvalidEntries++;
}
- String str = ServerProtoUtils.toLogEntryString(proto, smLogToString);
+ String str = LogProtoUtils.toLogEntryString(proto, smLogToString);
System.out.println(str);
}