WIP

Author: Tim-Brooks

server/src/main/java/org/elasticsearch/ingest/ESONXContentParser.java

@@ -23,6 +23,7 @@
 import java.nio.CharBuffer;
 import java.util.ArrayDeque;
 import java.util.Deque;
+import java.util.List;
 
 /**
  * Simplified XContentParser for flattened ESON structures.
@@ -40,7 +41,7 @@ public class ESONXContentParser extends AbstractXContentParser {
     private final XContentType xContentType;
 
     // Key array iteration state
-    private final ESONSource.KeyEntry[] keyArray;
+    private final List<ESONSource.KeyEntry> keyArray;
     private int currentIndex = 0;
 
     // Current token state
@@ -85,7 +86,7 @@ public ESONXContentParser(
         this.xContentType = xContentType;
 
         // Convert to array for efficient indexed access
-        this.keyArray = root.getKeyArray().toArray(new ESONSource.KeyEntry[0]);
+        this.keyArray = root.getKeyArray();
     }
 
     @Override
@@ -108,20 +109,22 @@ public Token nextToken() throws IOException {
         currentValue = null;
         valueComputed = false;
 
+        int size = keyArray.size();
+
         // First token - start root object
         if (currentToken == null) {
-            if (currentIndex >= keyArray.length) {
+            if (currentIndex >= size) {
                 return null;
             }
-            ESONSource.ObjectEntry rootEntry = (ESONSource.ObjectEntry) keyArray[currentIndex];
+            ESONSource.ObjectEntry rootEntry = (ESONSource.ObjectEntry) keyArray.get(currentIndex);
             containerStack.push(new ContainerContext(ContainerContext.Type.OBJECT, rootEntry.fieldCount));
             currentIndex++;
             currentToken = Token.START_OBJECT;
             return currentToken;
         }
 
         // Check if we've finished parsing
-        if (containerStack.isEmpty() && currentIndex >= keyArray.length) {
+        if (containerStack.isEmpty() && currentIndex >= size) {
             return null;
         }
 
@@ -133,14 +136,14 @@ public Token nextToken() throws IOException {
         }
 
         // If we've exhausted the array but still have containers, close them
-        if (currentIndex >= keyArray.length) {
+        if (currentIndex >= size) {
             ContainerContext ctx = containerStack.pop();
             currentToken = ctx.type == ContainerContext.Type.OBJECT ? Token.END_OBJECT : Token.END_ARRAY;
             return currentToken;
         }
 
         // Process next entry
-        ESONSource.KeyEntry entry = keyArray[currentIndex];
+        ESONSource.KeyEntry entry = keyArray.get(currentIndex);
         ContainerContext currentContainer = containerStack.peek();
 
         if (currentContainer == null) {

server/src/main/java/org/elasticsearch/ingest/IngestService.java

@@ -1343,13 +1343,7 @@ static String getProcessorName(Processor processor) {
     private static IngestDocument newIngestDocument(final IndexRequest request) {
         BytesReference source = request.source();
         ESONSource.Builder builder = new ESONSource.Builder((int) (source.length() * 0.70));
-        try (
-            XContentParser parser = XContentHelper.createParser(
-                XContentParserConfiguration.EMPTY,
-                source,
-                request.getContentType()
-            );
-        ) {
+        try (XContentParser parser = XContentHelper.createParser(XContentParserConfiguration.EMPTY, source, request.getContentType());) {
             ESONSource.ESONObject esonObject = builder.parse(parser);
             return new IngestDocument(
                 request.index(),

server/src/main/java/org/elasticsearch/threadpool/DefaultBuiltInExecutorBuilders.java

@@ -53,7 +53,7 @@ public Map<String, ExecutorBuilder> getBuilders(Settings settings, int allocated
             new FixedExecutorBuilder(
                 settings,
                 ThreadPool.Names.WRITE,
-                (int) (allocatedProcessors * 1.25),
+                allocatedProcessors,
                 // 10,000 for all nodes with 8 cores or fewer. Scale up once we have more than 8 cores.
                 Math.max(allocatedProcessors * 750, 10000),
                 EsExecutors.TaskTrackingConfig.builder()

server/src/main/java/org/elasticsearch/threadpool/ExecutorBuilder.java

@@ -43,7 +43,7 @@ protected static int applyHardSizeLimit(final Settings settings, final String na
         if (name.equals("bulk")
             || name.equals(ThreadPool.Names.WRITE_COORDINATION)
             || name.equals(ThreadPool.Names.SYSTEM_WRITE_COORDINATION)
-//            || name.equals(ThreadPool.Names.WRITE)
+            || name.equals(ThreadPool.Names.WRITE)
             || name.equals(ThreadPool.Names.SYSTEM_WRITE)
             || name.equals(ThreadPool.Names.SYSTEM_CRITICAL_WRITE)) {
             return 1 + EsExecutors.allocatedProcessors(settings);