more optimizations

Author: original-brownbear

server/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java

@@ -457,7 +457,11 @@ private static Boolean valueOrDefault(Boolean value, Boolean globalDefault) {
 
     @Override
     public long ramBytesUsed() {
-        return SHALLOW_SIZE + requests.stream().mapToLong(Accountable::ramBytesUsed).sum();
+        long sum = SHALLOW_SIZE;
+        for (DocWriteRequest<?> request : requests) {
+            sum += request.ramBytesUsed();
+        }
+        return sum;
     }
 
     public Set<String> getIndices() {

server/src/main/java/org/elasticsearch/action/bulk/BulkRequestParser.java

@@ -164,38 +164,14 @@ public void parse(
                     continue;
                 }
                 if (token != XContentParser.Token.START_OBJECT) {
-                    throw new IllegalArgumentException(
-                        "Malformed action/metadata line ["
-                            + line
-                            + "], expected "
-                            + XContentParser.Token.START_OBJECT
-                            + " but found ["
-                            + token
-                            + "]"
-                    );
+                    throwOnMalformedStart(line, token);
                 }
                 // Move to FIELD_NAME, that's the action
-                token = parser.nextToken();
-                if (token != XContentParser.Token.FIELD_NAME) {
-                    throw new IllegalArgumentException(
-                        "Malformed action/metadata line ["
-                            + line
-                            + "], expected "
-                            + XContentParser.Token.FIELD_NAME
-                            + " but found ["
-                            + token
-                            + "]"
-                    );
-                }
-                String action = parser.currentName();
-                if (SUPPORTED_ACTIONS.contains(action) == false) {
-                    throw new IllegalArgumentException(
-                        "Malformed action/metadata line ["
-                            + line
-                            + "], expected field [create], [delete], [index] or [update] but found ["
-                            + action
-                            + "]"
-                    );
+                String action = parser.nextFieldName();
+                if (action == null) {
+                    throwOnMalformedLine(line, parser);
+                } else if (SUPPORTED_ACTIONS.contains(action) == false) {
+                    throwOnUnsupportedAction(line, action);
                 }
 
                 String index = defaultIndex;
@@ -444,6 +420,34 @@ public void parse(
         }
     }
 
+    private static void throwOnMalformedStart(int line, XContentParser.Token token) {
+        throw new IllegalArgumentException(
+            "Malformed action/metadata line [" + line + "], expected " + XContentParser.Token.START_OBJECT + " but found [" + token + "]"
+        );
+    }
+
+    private static void throwOnMalformedLine(int line, XContentParser parser) {
+        throw new IllegalArgumentException(
+            "Malformed action/metadata line ["
+                + line
+                + "], expected "
+                + XContentParser.Token.FIELD_NAME
+                + " but found ["
+                + parser.currentToken()
+                + "]"
+        );
+    }
+
+    private static void throwOnUnsupportedAction(int line, String action) {
+        throw new IllegalArgumentException(
+            "Malformed action/metadata line ["
+                + line
+                + "], expected field [create], [delete], [index] or [update] but found ["
+                + action
+                + "]"
+        );
+    }
+
     @UpdateForV9
     // Warnings will need to be replaced with XContentEOFException from 9.x
     private static void warnBulkActionNotProperlyClosed(String message) {

server/src/main/java/org/elasticsearch/action/bulk/TransportBulkAction.java

@@ -607,15 +607,14 @@ static void prohibitAppendWritesInBackingIndices(DocWriteRequest<?> writeRequest
     }
 
     static void prohibitCustomRoutingOnDataStream(DocWriteRequest<?> writeRequest, Metadata metadata) {
-        IndexAbstraction indexAbstraction = metadata.getIndicesLookup().get(writeRequest.index());
-        if (indexAbstraction == null) {
-            return;
-        }
-        if (indexAbstraction.getType() != IndexAbstraction.Type.DATA_STREAM) {
-            return;
-        }
-
         if (writeRequest.routing() != null) {
+            IndexAbstraction indexAbstraction = metadata.getIndicesLookup().get(writeRequest.index());
+            if (indexAbstraction == null) {
+                return;
+            }
+            if (indexAbstraction.getType() != IndexAbstraction.Type.DATA_STREAM) {
+                return;
+            }
             DataStream dataStream = (DataStream) indexAbstraction;
             if (dataStream.isAllowCustomRouting() == false) {
                 throw new IllegalArgumentException(