More

Author: Tim-Brooks

server/src/main/java/org/elasticsearch/common/io/stream/RecyclerBytesStreamOutput.java

@@ -118,13 +118,18 @@ public void writeUTF8String(String str) throws IOException {
             return;
         }
 
+        // Ensure we have at least enough capacity for ASCII representation and max vint
+        if ((charCount + 5) > (pageSize - currentPageOffset)) {
+            ensureCapacity(charCount);
+        }
+
         // Optimistically write length assuming all ASCII (1 byte per char)
         long startPosition = position();
-        writeVInt(charCount);
-
-        // Ensure we have at least enough capacity for ASCII representation
-        if (charCount > (pageSize - currentPageOffset)) {
-            ensureCapacity(charCount);
+        if (Integer.numberOfLeadingZeros(charCount) >= 25) {
+            bytesRefBytes[bytesRefOffset + currentPageOffset] = (byte) charCount;
+            ++currentPageOffset;
+        } else {
+            currentPageOffset += putMultiByteVInt(bytesRefBytes, charCount, bytesRefOffset + currentPageOffset);
         }
 
         if (writeAsciiChars(str, charCount) == false) {
@@ -156,7 +161,6 @@ private boolean writeAsciiChars(String str, int charCount) {
             currentPageOffset += charsToWrite;
             charIndex += charsToWrite;
 
-            // Check if we need to move to next page AFTER writing
             if (currentPageOffset == pageSize && charIndex < charCount) {
                 nextPage();
             }

server/src/main/java/org/elasticsearch/common/io/stream/StreamOutput.java

@@ -254,7 +254,7 @@ public static int putVInt(byte[] buffer, int i, int off) {
         return putMultiByteVInt(buffer, i, off);
     }
 
-    private static int putMultiByteVInt(byte[] buffer, int i, int off) {
+    protected static int putMultiByteVInt(byte[] buffer, int i, int off) {
         int index = off;
         do {
             buffer[index++] = ((byte) ((i & 0x7f) | 0x80));