Merge branch 2.3 into 3.0

neo4j · Feb 12, 2016 · b2986b7 · b2986b7
2 parents b6ac29c + 7fc2ed8
commit b2986b7
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 5 deletions.
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/IoPrimitiveUtils.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/IoPrimitiveUtils.java
@@ -55,7 +55,7 @@ public static String read3bLengthAndString( ReadableChannel channel ) throws IOE
     {
         short lengthShort = channel.getShort();
         byte lengthByte = channel.get();
-        int length = (lengthByte << 16) | lengthShort;
+        int length = (lengthByte << 16) | (lengthShort & 0xFFFF);
         byte[] chars = new byte[length];
         channel.get( chars, length );
         return UTF8.decode( chars );

diff --git a/...y/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/InMemoryClosableChannel.java b/...y/kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/InMemoryClosableChannel.java
@@ -29,15 +29,13 @@
 
 public class InMemoryClosableChannel implements ReadableClosablePositionAwareChannel, FlushablePositionAwareChannel
 {
-    private static final Flushable NO_OP_FLUSHABLE = () -> { };
-
     private final byte[] bytes;
     private final ByteBuffer asWriter;
     private final ByteBuffer asReader;
 
     public InMemoryClosableChannel()
     {
-        this( new byte[1000] );
+        this( 1000 );
     }
 
     public InMemoryClosableChannel( byte[] bytes )
@@ -47,6 +45,12 @@ public InMemoryClosableChannel( byte[] bytes )
         this.asReader = ByteBuffer.wrap( this.bytes );
     }
 
+    public InMemoryClosableChannel( int bufferSize )
+    {
+        this( new byte[bufferSize] );
+    }
+
+
     public void reset()
     {
         asWriter.clear();
@@ -232,5 +236,5 @@ public int availableBytesToWrite()
     {
         return asWriter.remaining();
     }
-
+    private static final Flushable NO_OP_FLUSHABLE = () -> { };
 }
diff --git a/...kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/entry/LogHeaderReaderTest.java b/...kernel/src/test/java/org/neo4j/kernel/impl/transaction/log/entry/LogHeaderReaderTest.java
@@ -32,6 +32,7 @@
 import org.neo4j.io.fs.DefaultFileSystemAbstraction;
 import org.neo4j.io.fs.FileSystemAbstraction;
 import org.neo4j.kernel.impl.transaction.log.InMemoryClosableChannel;
+import org.neo4j.kernel.impl.util.IoPrimitiveUtils;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
@@ -153,4 +154,30 @@ public void shouldFailWhenUnableToReadALogHeaderFromAFile() throws IOException
             assertEquals( "Unable to read log version and last committed tx", ex.getMessage() );
         }
     }
+
+    @Test
+    public void shouldReadALongString() throws IOException
+    {
+        // given
+
+        // build a string longer than 32k
+        int stringSize = 32 * 1024 + 1;
+        StringBuilder sb = new StringBuilder();
+        for ( int i = 0; i < stringSize; i++ )
+        {
+            sb.append( "x" );
+        }
+        String lengthyString = sb.toString();
+
+        // we need 3 more bytes for writing the string length
+        InMemoryClosableChannel channel = new InMemoryClosableChannel( stringSize + 3 );
+
+        IoPrimitiveUtils.write3bLengthAndString( channel, lengthyString );
+
+        // when
+        String stringFromChannel = IoPrimitiveUtils.read3bLengthAndString( channel );
+
+        // then
+        assertEquals( lengthyString, stringFromChannel );
+    }
 }