Set default chunk size to play well with default RecvByteBufAllocator

neo4j · Sep 10, 2018 · 7e9dd4e · 7e9dd4e
1 parent ed46113
commit 7e9dd4e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 141 deletions.
diff --git a/...usalclustering/core/state/machines/tx/TransactionRepresentationReplicatedTransaction.java b/...usalclustering/core/state/machines/tx/TransactionRepresentationReplicatedTransaction.java
@@ -34,17 +34,14 @@
 import org.neo4j.causalclustering.messaging.BoundedNetworkChannel;
 import org.neo4j.causalclustering.messaging.marshalling.ChunkedEncoder;
 import org.neo4j.function.ThrowingConsumer;
-import org.neo4j.io.ByteUnit;
 import org.neo4j.kernel.impl.transaction.TransactionRepresentation;
 import org.neo4j.kernel.impl.transaction.log.entry.StorageCommandSerializer;
 import org.neo4j.storageengine.api.StorageCommand;
 import org.neo4j.storageengine.api.WritableChannel;
 
-import static org.neo4j.causalclustering.helper.NettyHelpers.calculateChunkSize;
-
 public class TransactionRepresentationReplicatedTransaction implements ReplicatedTransaction
 {
-    private static final int DEFAULT_CHUNK_SIZE = (int) ByteUnit.mebiBytes( 1 );
+    private static final int CHUNK_SIZE = 32 * 1024;
     private final TransactionRepresentation tx;
 
     TransactionRepresentationReplicatedTransaction( TransactionRepresentation tx )
@@ -84,8 +81,7 @@ public ByteBuf encodeChunk( ByteBufAllocator allocator ) throws IOException
             if ( channel == null )
             {
                 // Ensure that the written buffers does not overflow the allocators chunk size.
-                int maxChunkSize = calculateChunkSize( allocator, 0.8f, DEFAULT_CHUNK_SIZE );
+                channel = new BoundedNetworkChannel( allocator, CHUNK_SIZE, output );
-                channel = new BoundedNetworkChannel( allocator, maxChunkSize, output );
                 // Unknown length
                 channel.putInt( -1 );
             }

diff --git a/...prise/causal-clustering/src/main/java/org/neo4j/causalclustering/helper/NettyHelpers.java b/...prise/causal-clustering/src/main/java/org/neo4j/causalclustering/helper/NettyHelpers.java
diff --git a/...c/main/java/org/neo4j/causalclustering/messaging/marshalling/ByteArrayChunkedEncoder.java b/...c/main/java/org/neo4j/causalclustering/messaging/marshalling/ByteArrayChunkedEncoder.java
@@ -28,14 +28,11 @@
 import java.io.IOException;
 import java.util.Objects;
 
-import org.neo4j.io.ByteUnit;
 import org.neo4j.storageengine.api.WritableChannel;
 
-import static org.neo4j.causalclustering.helper.NettyHelpers.calculateChunkSize;
-
 public class ByteArrayChunkedEncoder implements ChunkedEncoder
 {
-    private static final int DEFAULT_CHUNK_SIZE = (int) ByteUnit.mebiBytes( 1 );
+    private static final int DEFAULT_CHUNK_SIZE = 32 * 1024;
     private final byte[] content;
     private int chunkSize;
     private int pos;
@@ -58,21 +55,12 @@ public class ByteArrayChunkedEncoder implements ChunkedEncoder
 
     public ByteArrayChunkedEncoder( byte[] content )
     {
-        Objects.requireNonNull( content, "content cannot be null" );
+        this( content, DEFAULT_CHUNK_SIZE );
-        if ( content.length == 0 )
-        {
-            throw new IllegalArgumentException( "Content cannot be an empty array" );
-        }
-        this.content = content;
     }
 
     @Override
     public ByteBuf encodeChunk( ByteBufAllocator allocator )
     {
-        if ( chunkSize == 0 )
-        {
-            chunkSize = calculateChunkSize( allocator, 0.8f, DEFAULT_CHUNK_SIZE );
-        }
         if ( isEndOfInput() )
         {
             return null;

diff --git a/...e/causal-clustering/src/test/java/org/neo4j/causalclustering/helper/NettyHelpersTest.java b/...e/causal-clustering/src/test/java/org/neo4j/causalclustering/helper/NettyHelpersTest.java