Merge pull request #207 from zhenlineo/1.0-memory-leak

Zhen Li · web-flow · commit 9c22889c8ed3 · 2016-08-01T17:02:25.000+02:00
Reduce long time memory usage
diff --git a/driver/src/main/java/org/neo4j/driver/internal/connector/socket/BufferingChunkedInput.java b/driver/src/main/java/org/neo4j/driver/internal/connector/socket/BufferingChunkedInput.java
@@ -81,9 +81,9 @@ public BufferingChunkedInput( ReadableByteChannel ch )
     public BufferingChunkedInput( ReadableByteChannel channel, int bufferCapacity )
     {
         assert bufferCapacity >= 1;
-        this.buffer = ByteBuffer.allocateDirect( bufferCapacity ).order( ByteOrder.BIG_ENDIAN );
+        this.buffer = ByteBuffer.allocate( bufferCapacity ).order( ByteOrder.BIG_ENDIAN );
         this.buffer.limit( 0 );
-        this.scratchBuffer = ByteBuffer.allocateDirect( 8 ).order( ByteOrder.BIG_ENDIAN );
+        this.scratchBuffer = ByteBuffer.allocate( 8 ).order( ByteOrder.BIG_ENDIAN );
         this.channel = channel;
         this.state = State.AWAITING_CHUNK;
     }
diff --git a/driver/src/main/java/org/neo4j/driver/internal/connector/socket/ChunkedInput.java b/driver/src/main/java/org/neo4j/driver/internal/connector/socket/ChunkedInput.java
@@ -37,7 +37,7 @@ public class ChunkedInput implements PackInput
     private final ByteBuffer buffer;
 
     /* a special buffer for chunk header */
-    private final ByteBuffer chunkHeaderBuffer = ByteBuffer.allocateDirect( 2 );
+    private final ByteBuffer chunkHeaderBuffer = ByteBuffer.allocate( 2 );
 
     /* the size of bytes that have not been read in current incoming chunk */
     private int unreadChunkSize = 0;
@@ -52,7 +52,7 @@ public ChunkedInput( ReadableByteChannel ch )
     public ChunkedInput( int bufferCapacity, ReadableByteChannel channel )
     {
         assert bufferCapacity >= 1;
-        buffer = ByteBuffer.allocateDirect( bufferCapacity ).order( ByteOrder.BIG_ENDIAN );
+        buffer = ByteBuffer.allocate( bufferCapacity ).order( ByteOrder.BIG_ENDIAN );
         buffer.limit( 0 );
         this.channel = channel;
     }
diff --git a/driver/src/main/java/org/neo4j/driver/internal/connector/socket/ChunkedOutput.java b/driver/src/main/java/org/neo4j/driver/internal/connector/socket/ChunkedOutput.java
@@ -48,7 +48,7 @@ public ChunkedOutput( WritableByteChannel ch )
 
     public ChunkedOutput( int bufferSize, WritableByteChannel ch )
     {
-        buffer = ByteBuffer.allocateDirect(  max( 16, bufferSize ) );
+        buffer = ByteBuffer.allocate(  max( 16, bufferSize ) );
         chunkOpen = false;
         channel = ch;
     }
diff --git a/driver/src/main/java/org/neo4j/driver/internal/connector/socket/SocketClient.java b/driver/src/main/java/org/neo4j/driver/internal/connector/socket/SocketClient.java
@@ -170,7 +170,7 @@ private SocketProtocol negotiateProtocol() throws IOException
     {
         logger.debug( "~~ [HANDSHAKE] [0x6060B017, 1, 0, 0, 0]." );
         //Propose protocol versions
-        ByteBuffer buf = ByteBuffer.allocateDirect( 5 * 4 ).order( BIG_ENDIAN );
+        ByteBuffer buf = ByteBuffer.allocate( 5 * 4 ).order( BIG_ENDIAN );
         buf.putInt( MAGIC_PREAMBLE );
         for ( int version : SUPPORTED_VERSIONS )
         {
diff --git a/driver/src/main/java/org/neo4j/driver/internal/connector/socket/TLSSocketChannel.java b/driver/src/main/java/org/neo4j/driver/internal/connector/socket/TLSSocketChannel.java
@@ -61,7 +61,7 @@ public class TLSSocketChannel implements ByteChannel
     private ByteBuffer plainIn;
     private ByteBuffer plainOut;
 
-    private static final ByteBuffer DUMMY_BUFFER = ByteBuffer.allocateDirect( 0 );
+    private static final ByteBuffer DUMMY_BUFFER = ByteBuffer.allocate( 0 );
 
     public TLSSocketChannel( String host, int port, ByteChannel channel, Logger logger,
                              TrustStrategy trustStrategy )
@@ -75,10 +75,10 @@ public TLSSocketChannel( String host, int port, ByteChannel channel, Logger logg
     public TLSSocketChannel( ByteChannel channel, Logger logger, SSLEngine sslEngine ) throws GeneralSecurityException, IOException
     {
         this(channel, logger, sslEngine,
-             ByteBuffer.allocateDirect( sslEngine.getSession().getApplicationBufferSize() ),
-             ByteBuffer.allocateDirect( sslEngine.getSession().getPacketBufferSize() ),
-             ByteBuffer.allocateDirect( sslEngine.getSession().getApplicationBufferSize() ),
-             ByteBuffer.allocateDirect( sslEngine.getSession().getPacketBufferSize() ) );
+             ByteBuffer.allocate( sslEngine.getSession().getApplicationBufferSize() ),
+             ByteBuffer.allocate( sslEngine.getSession().getPacketBufferSize() ),
+             ByteBuffer.allocate( sslEngine.getSession().getApplicationBufferSize() ),
+             ByteBuffer.allocate( sslEngine.getSession().getPacketBufferSize() ) );
     }
 
     TLSSocketChannel( ByteChannel channel, Logger logger, SSLEngine sslEngine,
@@ -216,7 +216,7 @@ private HandshakeStatus unwrap( ByteBuffer buffer ) throws IOException
                                            "buffer size allowed is %s. The content in the buffer is: %s\n",
                                     curAppSize, newAppSize, appSize * 2, BytePrinter.hex( plainIn ) ) );
                 }
-                ByteBuffer newPlainIn = ByteBuffer.allocateDirect( newAppSize );
+                ByteBuffer newPlainIn = ByteBuffer.allocate( newAppSize );
                 newPlainIn.put( plainIn );
                 plainIn = newPlainIn;
                 logger.debug( "Enlarged application input buffer from %s to %s. " +
@@ -229,7 +229,7 @@ private HandshakeStatus unwrap( ByteBuffer buffer ) throws IOException
                 // Resize buffer if needed.
                 if ( netSize > curNetSize )
                 {
-                    ByteBuffer newCipherIn = ByteBuffer.allocateDirect( netSize );
+                    ByteBuffer newCipherIn = ByteBuffer.allocate( netSize );
                     newCipherIn.put( cipherIn );
                     cipherIn = newCipherIn;
                     logger.debug( "Enlarged network input buffer from %s to %s. " +
@@ -297,7 +297,7 @@ private HandshakeStatus wrap( ByteBuffer buffer ) throws IOException
                                        "new network buffer.", curNetSize, netSize, buffer.capacity() ) );
             }
 
-            cipherOut = ByteBuffer.allocateDirect( netSize );
+            cipherOut = ByteBuffer.allocate( netSize );
             logger.debug( "Enlarged network output buffer from %s to %s. " +
                           "This operation should be a rare operation.", curNetSize, netSize );
             break;
diff --git a/driver/src/main/java/org/neo4j/driver/internal/packstream/BufferedChannelInput.java b/driver/src/main/java/org/neo4j/driver/internal/packstream/BufferedChannelInput.java
@@ -39,7 +39,7 @@ public BufferedChannelInput(ReadableByteChannel ch )
 
     public BufferedChannelInput( int bufferCapacity, ReadableByteChannel ch )
     {
-        this.buffer = ByteBuffer.allocateDirect( bufferCapacity ).order( ByteOrder.BIG_ENDIAN );
+        this.buffer = ByteBuffer.allocate( bufferCapacity ).order( ByteOrder.BIG_ENDIAN );
         reset( ch );
     }
 
diff --git a/driver/src/main/java/org/neo4j/driver/internal/packstream/BufferedChannelOutput.java b/driver/src/main/java/org/neo4j/driver/internal/packstream/BufferedChannelOutput.java
@@ -30,7 +30,7 @@ public class BufferedChannelOutput implements PackOutput
 
     public BufferedChannelOutput( int bufferSize )
     {
-        this.buffer = ByteBuffer.allocateDirect( bufferSize ).order( ByteOrder.BIG_ENDIAN );
+        this.buffer = ByteBuffer.allocate( bufferSize ).order( ByteOrder.BIG_ENDIAN );
     }
 
     public BufferedChannelOutput( WritableByteChannel channel )

Original file line number	Diff line number	Diff line change
`@@ -81,9 +81,9 @@ public BufferingChunkedInput( ReadableByteChannel ch )`
`81`	`81`	`public BufferingChunkedInput( ReadableByteChannel channel, int bufferCapacity )`
`82`	`82`	`{`
`83`	`83`	`assert bufferCapacity >= 1;`
`84`		`- this.buffer = ByteBuffer.allocateDirect( bufferCapacity ).order( ByteOrder.BIG_ENDIAN );`
	`84`	`+ this.buffer = ByteBuffer.allocate( bufferCapacity ).order( ByteOrder.BIG_ENDIAN );`
`85`	`85`	`this.buffer.limit( 0 );`
`86`		`- this.scratchBuffer = ByteBuffer.allocateDirect( 8 ).order( ByteOrder.BIG_ENDIAN );`
	`86`	`+ this.scratchBuffer = ByteBuffer.allocate( 8 ).order( ByteOrder.BIG_ENDIAN );`
`87`	`87`	`this.channel = channel;`
`88`	`88`	`this.state = State.AWAITING_CHUNK;`
`89`	`89`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public ChunkedOutput( WritableByteChannel ch )`
`48`	`48`
`49`	`49`	`public ChunkedOutput( int bufferSize, WritableByteChannel ch )`
`50`	`50`	`{`
`51`		`- buffer = ByteBuffer.allocateDirect( max( 16, bufferSize ) );`
	`51`	`+ buffer = ByteBuffer.allocate( max( 16, bufferSize ) );`
`52`	`52`	`chunkOpen = false;`
`53`	`53`	`channel = ch;`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ private SocketProtocol negotiateProtocol() throws IOException`
`170`	`170`	`{`
`171`	`171`	`logger.debug( "~~ [HANDSHAKE] [0x6060B017, 1, 0, 0, 0]." );`
`172`	`172`	`//Propose protocol versions`
`173`		`- ByteBuffer buf = ByteBuffer.allocateDirect( 5 * 4 ).order( BIG_ENDIAN );`
	`173`	`+ ByteBuffer buf = ByteBuffer.allocate( 5 * 4 ).order( BIG_ENDIAN );`
`174`	`174`	`buf.putInt( MAGIC_PREAMBLE );`
`175`	`175`	`for ( int version : SUPPORTED_VERSIONS )`
`176`	`176`	`{`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public BufferedChannelInput(ReadableByteChannel ch )`
`39`	`39`
`40`	`40`	`public BufferedChannelInput( int bufferCapacity, ReadableByteChannel ch )`
`41`	`41`	`{`
`42`		`- this.buffer = ByteBuffer.allocateDirect( bufferCapacity ).order( ByteOrder.BIG_ENDIAN );`
	`42`	`+ this.buffer = ByteBuffer.allocate( bufferCapacity ).order( ByteOrder.BIG_ENDIAN );`
`43`	`43`	`reset( ch );`
`44`	`44`	`}`
`45`	`45`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public class BufferedChannelOutput implements PackOutput`
`30`	`30`
`31`	`31`	`public BufferedChannelOutput( int bufferSize )`
`32`	`32`	`{`
`33`		`- this.buffer = ByteBuffer.allocateDirect( bufferSize ).order( ByteOrder.BIG_ENDIAN );`
	`33`	`+ this.buffer = ByteBuffer.allocate( bufferSize ).order( ByteOrder.BIG_ENDIAN );`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`public BufferedChannelOutput( WritableByteChannel channel )`