- Use a common scratchpad for serializing the different parts of the query.

- Use a threadlocal for the scratchpad. This avoids costly resizing, or initialiing too large buffer
  for every query. Using a thread local is fine now that we limit the number of search threads to a
  reasonable number = #cores * 2.

1 files changed, 2 insertions, 2 deletions

diff --git a/vespajlib/src/main/java/com/yahoo/io/GrowableByteBuffer.java b/vespajlib/src/main/java/com/yahoo/io/GrowableByteBuffer.java
index cf728d69d18..479375d6b74 100644
--- a/vespajlib/src/main/java/com/yahoo/io/GrowableByteBuffer.java
+++ b/vespajlib/src/main/java/com/yahoo/io/GrowableByteBuffer.java
@@ -90,7 +90,7 @@ public class GrowableByteBuffer implements Comparable<GrowableByteBuffer> {
     //ByteBuffers and keep track of global position etc., much like
     //GrowableBufferOutputStream does it.
 
-    protected void grow(int newSize) {
+    public void grow(int newSize) {
         //create new buffer:
         ByteBuffer newByteBuf;
         if (buffer.isDirect()) {
@@ -104,7 +104,7 @@ public class GrowableByteBuffer implements Comparable<GrowableByteBuffer> {
         //copy old contents and set correct position:
         int oldPos = buffer.position();
         newByteBuf.position(0);
-        buffer.position(0);
+        buffer.flip();
         newByteBuf.put(buffer);
         newByteBuf.position(oldPos);