From 7f035ca5b3bb96f3395a78ab6e6a4169c2782134 Mon Sep 17 00:00:00 2001 From: RagnarW Date: Fri, 1 Jun 2018 13:08:21 +0200 Subject: [PATCH] Use Marshal in naming --- .../core/consensus/ConsensusModule.java | 4 ++-- .../log/segmented/DumpSegmentedRaftLog.java | 4 ++-- .../v1/RaftProtocolClientInstallerV1.java | 4 ++-- .../v1/RaftProtocolServerInstallerV1.java | 4 ++-- .../v2/RaftProtocolClientInstallerV2.java | 4 ++-- .../core/replication/DistributedOperation.java | 6 +++--- .../core/state/machines/dummy/DummyRequest.java | 12 +++++------- .../tx/ReplicatedTransactionSerializer.java | 8 ++++---- ...er.java => ByteArrayByteBufAwareMarshal.java} | 4 ++-- ...{Serializer.java => ByteBufAwareMarshal.java} | 6 +++--- .../marshalling/ChunkedReplicatedContent.java | 16 ++++++++-------- ...er.java => CoreReplicatedContentMarshal.java} | 4 ++-- .../decoding/ReplicatedContentChunkDecoder.java | 8 ++++---- .../v2/encoding/RaftMessageContentEncoder.java | 6 +++--- .../core/consensus/log/debug/ReplayRaftLog.java | 4 ++-- ...SegmentedRaftLogPartialEntryRecoveryTest.java | 6 +++--- .../CoreReplicatedContentMarshalTest.java | 4 ++-- ...ava => ByteArrayByteBufAwareMarshalTest.java} | 6 +++--- .../v2/CoreReplicatedContentMarshallingTest.java | 4 ++-- 19 files changed, 56 insertions(+), 58 deletions(-) rename enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/{ByteArraySerializer.java => ByteArrayByteBufAwareMarshal.java} (94%) rename enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/{Serializer.java => ByteBufAwareMarshal.java} (93%) rename enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/{CoreReplicatedContentSerializer.java => CoreReplicatedContentMarshal.java} (97%) rename enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/messaging/marshalling/{ByteArraySerializerTest.java => ByteArrayByteBufAwareMarshalTest.java} (90%) diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/ConsensusModule.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/ConsensusModule.java index 20b072a9a250..a0ce5f9f3b6a 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/ConsensusModule.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/ConsensusModule.java @@ -52,7 +52,7 @@ import org.neo4j.causalclustering.identity.MemberId; import org.neo4j.causalclustering.messaging.Outbound; import org.neo4j.causalclustering.messaging.marshalling.ChannelMarshal; -import org.neo4j.causalclustering.messaging.marshalling.CoreReplicatedContentSerializer; +import org.neo4j.causalclustering.messaging.marshalling.CoreReplicatedContentMarshal; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.factory.PlatformModule; @@ -92,7 +92,7 @@ public ConsensusModule( MemberId myself, final PlatformModule platformModule, LogProvider logProvider = logging.getInternalLogProvider(); - final CoreReplicatedContentSerializer marshal = new CoreReplicatedContentSerializer(); + final CoreReplicatedContentMarshal marshal = new CoreReplicatedContentMarshal(); RaftLog underlyingLog = createRaftLog( config, life, fileSystem, clusterStateDirectory, marshal, logProvider, platformModule.jobScheduler ); diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/log/segmented/DumpSegmentedRaftLog.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/log/segmented/DumpSegmentedRaftLog.java index 5cb8ac8f85e5..2198e6206f7f 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/log/segmented/DumpSegmentedRaftLog.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/log/segmented/DumpSegmentedRaftLog.java @@ -30,7 +30,7 @@ import org.neo4j.causalclustering.core.consensus.log.EntryRecord; import org.neo4j.causalclustering.core.replication.ReplicatedContent; import org.neo4j.causalclustering.messaging.marshalling.ChannelMarshal; -import org.neo4j.causalclustering.messaging.marshalling.CoreReplicatedContentSerializer; +import org.neo4j.causalclustering.messaging.marshalling.CoreReplicatedContentMarshal; import org.neo4j.cursor.IOCursor; import org.neo4j.helpers.Args; import org.neo4j.io.fs.DefaultFileSystemAbstraction; @@ -101,7 +101,7 @@ public static void main( String[] args ) try ( DefaultFileSystemAbstraction fileSystem = new DefaultFileSystemAbstraction() ) { - new DumpSegmentedRaftLog( fileSystem, new CoreReplicatedContentSerializer() ) + new DumpSegmentedRaftLog( fileSystem, new CoreReplicatedContentMarshal() ) .dump( fileAsString, printer.getFor( fileAsString ) ); } catch ( IOException | DisposedException | DamagedLogStorageException e ) diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/protocol/v1/RaftProtocolClientInstallerV1.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/protocol/v1/RaftProtocolClientInstallerV1.java index 6549c9c97044..f15ceb409ee3 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/protocol/v1/RaftProtocolClientInstallerV1.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/protocol/v1/RaftProtocolClientInstallerV1.java @@ -29,7 +29,7 @@ import java.util.stream.Collectors; import org.neo4j.causalclustering.messaging.marshalling.v1.RaftMessageEncoder; -import org.neo4j.causalclustering.messaging.marshalling.CoreReplicatedContentSerializer; +import org.neo4j.causalclustering.messaging.marshalling.CoreReplicatedContentMarshal; import org.neo4j.causalclustering.protocol.ModifierProtocolInstaller; import org.neo4j.causalclustering.protocol.NettyPipelineBuilderFactory; import org.neo4j.causalclustering.protocol.Protocol; @@ -69,7 +69,7 @@ public void install( Channel channel ) throws Exception clientPipelineBuilderFactory.client( channel, log ) .modify( modifiers ) .addFraming() - .add( "raft_encoder", new RaftMessageEncoder( new CoreReplicatedContentSerializer() ) ) + .add( "raft_encoder", new RaftMessageEncoder( new CoreReplicatedContentMarshal() ) ) .install(); } diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/protocol/v1/RaftProtocolServerInstallerV1.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/protocol/v1/RaftProtocolServerInstallerV1.java index c1e4eec6f8ec..6176c85a69e0 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/protocol/v1/RaftProtocolServerInstallerV1.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/protocol/v1/RaftProtocolServerInstallerV1.java @@ -31,7 +31,7 @@ import java.util.stream.Collectors; import org.neo4j.causalclustering.messaging.marshalling.v1.RaftMessageDecoder; -import org.neo4j.causalclustering.messaging.marshalling.CoreReplicatedContentSerializer; +import org.neo4j.causalclustering.messaging.marshalling.CoreReplicatedContentMarshal; import org.neo4j.causalclustering.protocol.ModifierProtocolInstaller; import org.neo4j.causalclustering.protocol.NettyPipelineBuilderFactory; import org.neo4j.causalclustering.protocol.Protocol; @@ -73,7 +73,7 @@ public void install( Channel channel ) throws Exception pipelineBuilderFactory.server( channel, log ) .modify( modifiers ) .addFraming() - .add( "raft_decoder", new RaftMessageDecoder( new CoreReplicatedContentSerializer(), Clock.systemUTC() ) ) + .add( "raft_decoder", new RaftMessageDecoder( new CoreReplicatedContentMarshal(), Clock.systemUTC() ) ) .add( "raft_handler", raftMessageHandler ) .install(); } diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/protocol/v2/RaftProtocolClientInstallerV2.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/protocol/v2/RaftProtocolClientInstallerV2.java index 10d46ee54170..2c2ce1f9d092 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/protocol/v2/RaftProtocolClientInstallerV2.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/consensus/protocol/v2/RaftProtocolClientInstallerV2.java @@ -29,7 +29,7 @@ import java.util.List; import java.util.stream.Collectors; -import org.neo4j.causalclustering.messaging.marshalling.CoreReplicatedContentSerializer; +import org.neo4j.causalclustering.messaging.marshalling.CoreReplicatedContentMarshal; import org.neo4j.causalclustering.messaging.marshalling.v2.encoding.ContentTypeEncoder; import org.neo4j.causalclustering.messaging.marshalling.v2.encoding.RaftLogEntryTermEncoder; import org.neo4j.causalclustering.messaging.marshalling.v2.encoding.RaftMessageContentEncoder; @@ -77,7 +77,7 @@ public void install( Channel channel ) throws Exception .add( "raft_content_type_encoder", new ContentTypeEncoder() ) .add( "raft_chunked_writer", new ChunkedWriteHandler( ) ) .add( "raft_log_entry_encoder", new RaftLogEntryTermEncoder() ) - .add( "raft_message_content_encoder", new RaftMessageContentEncoder( new CoreReplicatedContentSerializer() ) ) + .add( "raft_message_content_encoder", new RaftMessageContentEncoder( new CoreReplicatedContentMarshal() ) ) .install(); } diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/replication/DistributedOperation.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/replication/DistributedOperation.java index 25d50c1e8bde..e4f8f82445fe 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/replication/DistributedOperation.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/replication/DistributedOperation.java @@ -30,7 +30,7 @@ import org.neo4j.causalclustering.core.replication.session.LocalOperationId; import org.neo4j.causalclustering.identity.MemberId; import org.neo4j.causalclustering.messaging.EndOfStreamException; -import org.neo4j.causalclustering.messaging.marshalling.Serializer; +import org.neo4j.causalclustering.messaging.marshalling.ByteBufAwareMarshal; import org.neo4j.causalclustering.messaging.marshalling.ContentBuilder; import org.neo4j.storageengine.api.ReadableChannel; @@ -82,9 +82,9 @@ public long size() * * @return Consumer with instructions for writing to channel. */ - public Serializer serialize() + public ByteBufAwareMarshal serialize() { - return Serializer.simple( channel1 -> + return ByteBufAwareMarshal.simple( channel1 -> { channel1.putLong( globalSession().sessionId().getMostSignificantBits() ); channel1.putLong( globalSession().sessionId().getLeastSignificantBits() ); diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/dummy/DummyRequest.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/dummy/DummyRequest.java index 9c713a0ac7cb..f24be1e50a51 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/dummy/DummyRequest.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/dummy/DummyRequest.java @@ -26,14 +26,12 @@ import java.util.Arrays; import java.util.function.Consumer; -import org.neo4j.causalclustering.core.replication.ReplicatedContent; import org.neo4j.causalclustering.core.state.CommandDispatcher; import org.neo4j.causalclustering.core.state.Result; import org.neo4j.causalclustering.core.state.machines.tx.CoreReplicatedContent; import org.neo4j.causalclustering.core.state.storage.SafeChannelMarshal; -import org.neo4j.causalclustering.messaging.marshalling.ByteArraySerializer; -import org.neo4j.causalclustering.messaging.marshalling.ContentBuilder; -import org.neo4j.causalclustering.messaging.marshalling.Serializer; +import org.neo4j.causalclustering.messaging.marshalling.ByteArrayByteBufAwareMarshal; +import org.neo4j.causalclustering.messaging.marshalling.ByteBufAwareMarshal; import org.neo4j.storageengine.api.ReadableChannel; import org.neo4j.storageengine.api.WritableChannel; @@ -69,15 +67,15 @@ public void dispatch( CommandDispatcher commandDispatcher, long commandIndex, Co commandDispatcher.dispatch( this, commandIndex, callback ); } - public Serializer serializer() + public ByteBufAwareMarshal serializer() { if ( data != null ) { - return new ByteArraySerializer( data ); + return new ByteArrayByteBufAwareMarshal( data ); } else { - return Serializer.simple( channel -> channel.putInt( 0 ) ); + return ByteBufAwareMarshal.simple( channel -> channel.putInt( 0 ) ); } } diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/tx/ReplicatedTransactionSerializer.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/tx/ReplicatedTransactionSerializer.java index 1cff684d1ad5..00e163f5b622 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/tx/ReplicatedTransactionSerializer.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/state/machines/tx/ReplicatedTransactionSerializer.java @@ -26,8 +26,8 @@ import java.io.IOException; -import org.neo4j.causalclustering.messaging.marshalling.ByteArraySerializer; -import org.neo4j.causalclustering.messaging.marshalling.Serializer; +import org.neo4j.causalclustering.messaging.marshalling.ByteArrayByteBufAwareMarshal; +import org.neo4j.causalclustering.messaging.marshalling.ByteBufAwareMarshal; import org.neo4j.storageengine.api.ReadableChannel; import org.neo4j.storageengine.api.WritableChannel; @@ -69,8 +69,8 @@ public static ReplicatedTransaction unmarshal( ByteBuf buffer ) return new ReplicatedTransaction( txBytes ); } - public static Serializer serializer( ReplicatedTransaction replicatedTransaction ) + public static ByteBufAwareMarshal serializer( ReplicatedTransaction replicatedTransaction ) { - return new ByteArraySerializer( replicatedTransaction.getTxBytes() ); + return new ByteArrayByteBufAwareMarshal( replicatedTransaction.getTxBytes() ); } } diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/ByteArraySerializer.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/ByteArrayByteBufAwareMarshal.java similarity index 94% rename from enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/ByteArraySerializer.java rename to enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/ByteArrayByteBufAwareMarshal.java index f5fc62619f0b..26e510201f5b 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/ByteArraySerializer.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/ByteArrayByteBufAwareMarshal.java @@ -29,12 +29,12 @@ import org.neo4j.storageengine.api.WritableChannel; -public class ByteArraySerializer implements Serializer +public class ByteArrayByteBufAwareMarshal implements ByteBufAwareMarshal { private final byte[] content; private final ByteArrayInputStream inputStream; - public ByteArraySerializer( byte[] content ) + public ByteArrayByteBufAwareMarshal( byte[] content ) { inputStream = new ByteArrayInputStream( content ); this.content = content; diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/Serializer.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/ByteBufAwareMarshal.java similarity index 93% rename from enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/Serializer.java rename to enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/ByteBufAwareMarshal.java index 23e3bc5787f1..13b37655cc5c 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/Serializer.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/ByteBufAwareMarshal.java @@ -30,15 +30,15 @@ import org.neo4j.function.ThrowingConsumer; import org.neo4j.storageengine.api.WritableChannel; -public interface Serializer extends Marshal +public interface ByteBufAwareMarshal extends Marshal { /** May override buffer allocation size. * @param channelConsumer used by both encode and marshal to serialize the object. * @return a simple serializer that encodes all the content at once. */ - static Serializer simple( ThrowingConsumer channelConsumer ) + static ByteBufAwareMarshal simple( ThrowingConsumer channelConsumer ) { - return new Serializer() + return new ByteBufAwareMarshal() { private boolean consumed; diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/ChunkedReplicatedContent.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/ChunkedReplicatedContent.java index 426afa431439..3c45e7e798a9 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/ChunkedReplicatedContent.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/ChunkedReplicatedContent.java @@ -36,14 +36,14 @@ public class ChunkedReplicatedContent implements Marshal, ChunkedInput private static final int DEFAULT_CHUNK_SIZE = 8192; private final byte contentType; - private final Serializer serializer; + private final ByteBufAwareMarshal byteBufAwareMarshal; private final int chunkSize; private boolean lastByteWasWritten; private int progress; - public ChunkedReplicatedContent( byte contentType, Serializer serializer, int chunkSize ) + public ChunkedReplicatedContent( byte contentType, ByteBufAwareMarshal byteBufAwareMarshal, int chunkSize ) { - this.serializer = serializer; + this.byteBufAwareMarshal = byteBufAwareMarshal; this.chunkSize = chunkSize; if ( chunkSize < 7 ) { @@ -52,16 +52,16 @@ public ChunkedReplicatedContent( byte contentType, Serializer serializer, int ch this.contentType = contentType; } - public ChunkedReplicatedContent( byte contentType, Serializer serializer ) + public ChunkedReplicatedContent( byte contentType, ByteBufAwareMarshal byteBufAwareMarshal ) { - this( contentType, serializer, DEFAULT_CHUNK_SIZE ); + this( contentType, byteBufAwareMarshal, DEFAULT_CHUNK_SIZE ); } @Override public void marshal( WritableChannel channel ) throws IOException { channel.put( contentType ); - serializer.marshal( channel ); + byteBufAwareMarshal.marshal( channel ); } @Override @@ -98,9 +98,9 @@ public ByteBuf readChunk( ByteBufAllocator allocator ) throws IOException { // extra metadata on first chunk buffer.writeByte( contentType ); - buffer.writeInt( serializer.length() ); + buffer.writeInt( byteBufAwareMarshal.length() ); } - if ( !serializer.encode( buffer ) ) + if ( !byteBufAwareMarshal.encode( buffer ) ) { lastByteWasWritten = true; } diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/CoreReplicatedContentSerializer.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/CoreReplicatedContentMarshal.java similarity index 97% rename from enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/CoreReplicatedContentSerializer.java rename to enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/CoreReplicatedContentMarshal.java index c609e513fba9..38c2e240a6c9 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/CoreReplicatedContentSerializer.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/CoreReplicatedContentMarshal.java @@ -46,9 +46,9 @@ import org.neo4j.storageengine.api.WritableChannel; import static java.util.Collections.singleton; -import static org.neo4j.causalclustering.messaging.marshalling.Serializer.simple; +import static org.neo4j.causalclustering.messaging.marshalling.ByteBufAwareMarshal.simple; -public class CoreReplicatedContentSerializer extends SafeChannelMarshal +public class CoreReplicatedContentMarshal extends SafeChannelMarshal { private static final byte TX_CONTENT_TYPE = 0; private static final byte RAFT_MEMBER_SET_TYPE = 1; diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/v2/decoding/ReplicatedContentChunkDecoder.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/v2/decoding/ReplicatedContentChunkDecoder.java index 99d31b6bbe8a..86b960eeb1ae 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/v2/decoding/ReplicatedContentChunkDecoder.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/v2/decoding/ReplicatedContentChunkDecoder.java @@ -30,12 +30,12 @@ import java.util.List; import org.neo4j.causalclustering.messaging.NetworkReadableClosableChannelNetty4; -import org.neo4j.causalclustering.messaging.marshalling.CoreReplicatedContentSerializer; +import org.neo4j.causalclustering.messaging.marshalling.CoreReplicatedContentMarshal; public class ReplicatedContentChunkDecoder extends ByteToMessageDecoder implements AutoCloseable { private UnfinishedChunk unfinishedChunk; - private final CoreReplicatedContentSerializer coreReplicatedContentSerializer = new CoreReplicatedContentSerializer(); + private final CoreReplicatedContentMarshal coreReplicatedContentMarshal = new CoreReplicatedContentMarshal(); private boolean closed; @Override @@ -55,7 +55,7 @@ protected void decode( ChannelHandlerContext ctx, ByteBuf in, List out ) int allocationSize = in.readInt(); if ( isLast ) { - out.add( coreReplicatedContentSerializer.read( contentType, + out.add( coreReplicatedContentMarshal.read( contentType, new NetworkReadableClosableChannelNetty4( in.readSlice( in.readableBytes() ) ) ) ); } else @@ -79,7 +79,7 @@ protected void decode( ChannelHandlerContext ctx, ByteBuf in, List out ) if ( isLast ) { - out.add( coreReplicatedContentSerializer.read( unfinishedChunk.contentType, + out.add( coreReplicatedContentMarshal.read( unfinishedChunk.contentType, new NetworkReadableClosableChannelNetty4( unfinishedChunk.content() ) ) ); unfinishedChunk.release(); unfinishedChunk = null; diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/v2/encoding/RaftMessageContentEncoder.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/v2/encoding/RaftMessageContentEncoder.java index 75adac84dbc8..11ca09cfee24 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/v2/encoding/RaftMessageContentEncoder.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/messaging/marshalling/v2/encoding/RaftMessageContentEncoder.java @@ -32,7 +32,7 @@ import org.neo4j.causalclustering.core.consensus.RaftMessages; import org.neo4j.causalclustering.core.consensus.log.RaftLogEntry; import org.neo4j.causalclustering.core.replication.ReplicatedContent; -import org.neo4j.causalclustering.messaging.marshalling.CoreReplicatedContentSerializer; +import org.neo4j.causalclustering.messaging.marshalling.CoreReplicatedContentMarshal; import org.neo4j.causalclustering.messaging.marshalling.v2.ContentType; import static org.neo4j.causalclustering.messaging.marshalling.v2.encoding.RaftLogEntryTermEncoder.serializable; @@ -40,9 +40,9 @@ public class RaftMessageContentEncoder extends MessageToMessageEncoder { - private final CoreReplicatedContentSerializer serializer; + private final CoreReplicatedContentMarshal serializer; - public RaftMessageContentEncoder( CoreReplicatedContentSerializer serializer ) + public RaftMessageContentEncoder( CoreReplicatedContentMarshal serializer ) { this.serializer = serializer; } diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/log/debug/ReplayRaftLog.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/log/debug/ReplayRaftLog.java index bbfaf01958dc..b1d315a596cb 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/log/debug/ReplayRaftLog.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/log/debug/ReplayRaftLog.java @@ -31,7 +31,7 @@ import org.neo4j.causalclustering.core.replication.ReplicatedContent; import org.neo4j.causalclustering.core.state.machines.tx.ReplicatedTransaction; import org.neo4j.causalclustering.core.state.machines.tx.ReplicatedTransactionFactory; -import org.neo4j.causalclustering.messaging.marshalling.CoreReplicatedContentSerializer; +import org.neo4j.causalclustering.messaging.marshalling.CoreReplicatedContentMarshal; import org.neo4j.helpers.Args; import org.neo4j.io.fs.DefaultFileSystemAbstraction; import org.neo4j.kernel.configuration.Config; @@ -71,7 +71,7 @@ public static void main( String[] args ) throws IOException CoreLogPruningStrategy pruningStrategy = new CoreLogPruningStrategyFactory( config.get( raft_log_pruning_strategy ), logProvider ).newInstance(); SegmentedRaftLog log = new SegmentedRaftLog( fileSystem, logDirectory, config.get( raft_log_rotation_size ), - new CoreReplicatedContentSerializer(), logProvider, config.get( raft_log_reader_pool_size ), + new CoreReplicatedContentMarshal(), logProvider, config.get( raft_log_reader_pool_size ), Clocks.systemClock(), new OnDemandJobScheduler(), pruningStrategy ); long totalCommittedEntries = log.appendIndex(); // Not really, but we need to have a way to pass in the commit index diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/log/segmented/SegmentedRaftLogPartialEntryRecoveryTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/log/segmented/SegmentedRaftLogPartialEntryRecoveryTest.java index fa2b1cb11c68..1a9175373b49 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/log/segmented/SegmentedRaftLogPartialEntryRecoveryTest.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/log/segmented/SegmentedRaftLogPartialEntryRecoveryTest.java @@ -39,7 +39,7 @@ import org.neo4j.causalclustering.core.state.machines.token.TokenType; import org.neo4j.causalclustering.core.state.machines.tx.ReplicatedTransaction; import org.neo4j.causalclustering.identity.MemberId; -import org.neo4j.causalclustering.messaging.marshalling.CoreReplicatedContentSerializer; +import org.neo4j.causalclustering.messaging.marshalling.CoreReplicatedContentMarshal; import org.neo4j.io.fs.OpenMode; import org.neo4j.io.fs.StoreChannel; import org.neo4j.kernel.impl.store.id.IdType; @@ -79,7 +79,7 @@ private SegmentedRaftLog createRaftLog( long rotateAtSize ) LogProvider logProvider = getInstance(); CoreLogPruningStrategy pruningStrategy = new CoreLogPruningStrategyFactory( "100 entries", logProvider ).newInstance(); - return new SegmentedRaftLog( fsRule.get(), logDirectory, rotateAtSize, new CoreReplicatedContentSerializer(), + return new SegmentedRaftLog( fsRule.get(), logDirectory, rotateAtSize, new CoreReplicatedContentMarshal(), logProvider, 8, Clocks.fakeClock(), new OnDemandJobScheduler(), pruningStrategy ); } @@ -88,7 +88,7 @@ private RecoveryProtocol createRecoveryProtocol() FileNames fileNames = new FileNames( logDirectory ); return new RecoveryProtocol( fsRule.get(), fileNames, new ReaderPool( 8, getInstance(), fileNames, fsRule.get(), Clocks.fakeClock() ), - new CoreReplicatedContentSerializer(), getInstance() ); + new CoreReplicatedContentMarshal(), getInstance() ); } @Test diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/replication/CoreReplicatedContentMarshalTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/replication/CoreReplicatedContentMarshalTest.java index b92effc614af..0dd01e6f5cf3 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/replication/CoreReplicatedContentMarshalTest.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/replication/CoreReplicatedContentMarshalTest.java @@ -42,7 +42,7 @@ import org.neo4j.causalclustering.messaging.marshalling.ChannelMarshal; import org.neo4j.causalclustering.messaging.EndOfStreamException; import org.neo4j.causalclustering.identity.MemberId; -import org.neo4j.causalclustering.messaging.marshalling.CoreReplicatedContentSerializer; +import org.neo4j.causalclustering.messaging.marshalling.CoreReplicatedContentMarshal; import org.neo4j.kernel.impl.store.id.IdType; import org.neo4j.kernel.impl.store.record.LabelTokenRecord; import org.neo4j.kernel.impl.transaction.command.Command; @@ -55,7 +55,7 @@ public class CoreReplicatedContentMarshalTest { - private final ChannelMarshal marshal = new CoreReplicatedContentSerializer(); + private final ChannelMarshal marshal = new CoreReplicatedContentMarshal(); @Test public void shouldMarshalTransactionReference() throws Exception diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/messaging/marshalling/ByteArraySerializerTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/messaging/marshalling/ByteArrayByteBufAwareMarshalTest.java similarity index 90% rename from enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/messaging/marshalling/ByteArraySerializerTest.java rename to enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/messaging/marshalling/ByteArrayByteBufAwareMarshalTest.java index e3275547d978..3a48404bd4fd 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/messaging/marshalling/ByteArraySerializerTest.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/messaging/marshalling/ByteArrayByteBufAwareMarshalTest.java @@ -33,14 +33,14 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -public class ByteArraySerializerTest +public class ByteArrayByteBufAwareMarshalTest { @Test public void shouldWriteToBufferInChunks() throws IOException { byte[] data = new byte[]{1, 2, 3, 4, 5, 6}; byte[] readData = new byte[6]; - ByteArraySerializer byteArraySerializer = new ByteArraySerializer( data ); + ByteArrayByteBufAwareMarshal byteArraySerializer = new ByteArrayByteBufAwareMarshal( data ); ByteBuf buffer = Unpooled.buffer( 5 ); assertTrue( byteArraySerializer.encode( buffer ) ); @@ -61,7 +61,7 @@ public void shouldWriteToBufferInChunks() throws IOException public void shouldHaveSameLengthAsBytesEncoded() throws IOException { byte[] data = new byte[10]; - ByteArraySerializer byteArraySerializer = new ByteArraySerializer( data ); + ByteArrayByteBufAwareMarshal byteArraySerializer = new ByteArrayByteBufAwareMarshal( data ); ByteBuf buffer = Unpooled.buffer( 100 ); byteArraySerializer.encode( buffer ); diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/messaging/marshalling/v2/CoreReplicatedContentMarshallingTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/messaging/marshalling/v2/CoreReplicatedContentMarshallingTest.java index 48d26cfaf3bc..cc42cd2e5e7e 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/messaging/marshalling/v2/CoreReplicatedContentMarshallingTest.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/messaging/marshalling/v2/CoreReplicatedContentMarshallingTest.java @@ -49,7 +49,7 @@ import org.neo4j.causalclustering.messaging.NetworkFlushableChannelNetty4; import org.neo4j.causalclustering.messaging.NetworkReadableClosableChannelNetty4; import org.neo4j.causalclustering.messaging.marshalling.ChannelMarshal; -import org.neo4j.causalclustering.messaging.marshalling.CoreReplicatedContentSerializer; +import org.neo4j.causalclustering.messaging.marshalling.CoreReplicatedContentMarshal; import static org.junit.Assert.assertEquals; @@ -93,7 +93,7 @@ public void releaseBuffer() @Test public void shouldSerializeAndDeserialize() throws Exception { - ChannelMarshal coreReplicatedContentSerializer = new CoreReplicatedContentSerializer(); + ChannelMarshal coreReplicatedContentSerializer = new CoreReplicatedContentMarshal(); NetworkFlushableChannelNetty4 channel = new NetworkFlushableChannelNetty4( buffer ); coreReplicatedContentSerializer.marshal( replicatedContent, channel );