Shortens AbstractIonWriter.writeValues, allowing the JIT to optimize it more efficiently, improving performance by up to 12%.

Author: tgregg

src/main/java/com/amazon/ion/impl/bin/AbstractIonWriter.java

@@ -127,80 +127,86 @@ public final void writeValueRecursive(final IonReader reader) throws IOException
                 stepOut();
                 continue;
             }
-
-            final SymbolToken fieldName = reader.getFieldNameSymbol();
-            if (fieldName != null && !isFieldNameSet() && isInStruct()) {
-                setFieldNameSymbol(fieldName);
-            }
-            final SymbolToken[] annotations = reader.getTypeAnnotationSymbols();
-            if (annotations.length > 0) {
-                setTypeAnnotationSymbols(annotations);
-            }
+            transferFieldNameAndAnnotations(reader);
             if (reader.isNullValue()) {
                 writeNull(type);
                 continue;
             }
+            writeCurrentValue(type, reader);
+        }
+    }
 
-            switch (type) {
-                case BOOL:
-                    final boolean booleanValue = reader.booleanValue();
-                    writeBool(booleanValue);
-                    break;
-                case INT:
-                    switch (reader.getIntegerSize()) {
-                        case INT:
-                            final int intValue = reader.intValue();
-                            writeInt(intValue);
-                            break;
-                        case LONG:
-                            final long longValue = reader.longValue();
-                            writeInt(longValue);
-                            break;
-                        case BIG_INTEGER:
-                            final BigInteger bigIntegerValue = reader.bigIntegerValue();
-                            writeInt(bigIntegerValue);
-                            break;
-                        default:
-                            throw new IllegalStateException();
-                    }
-                    break;
-                case FLOAT:
-                    final double doubleValue = reader.doubleValue();
-                    writeFloat(doubleValue);
-                    break;
-                case DECIMAL:
-                    final Decimal decimalValue = reader.decimalValue();
-                    writeDecimal(decimalValue);
-                    break;
-                case TIMESTAMP:
-                    final Timestamp timestampValue = reader.timestampValue();
-                    writeTimestamp(timestampValue);
-                    break;
-                case SYMBOL:
-                    final SymbolToken symbolToken = reader.symbolValue();
-                    writeSymbolToken(symbolToken);
-                    break;
-                case STRING:
-                    final String stringValue = reader.stringValue();
-                    writeString(stringValue);
-                    break;
-                case CLOB:
-                    final byte[] clobValue = reader.newBytes();
-                    writeClob(clobValue);
-                    break;
-                case BLOB:
-                    final byte[] blobValue = reader.newBytes();
-                    writeBlob(blobValue);
-                    break;
-                case LIST:
-                case SEXP:
-                case STRUCT:
-                    reader.stepIn();
-                    stepIn(type);
-                    break;
-                default:
-                    throw new IllegalStateException("Unexpected type: " + type);
-            }
+    private void transferFieldNameAndAnnotations(IonReader reader) {
+        final SymbolToken fieldName = reader.getFieldNameSymbol();
+        if (fieldName != null && !isFieldNameSet() && isInStruct()) {
+            setFieldNameSymbol(fieldName);
+        }
+        final SymbolToken[] annotations = reader.getTypeAnnotationSymbols();
+        if (annotations.length > 0) {
+            setTypeAnnotationSymbols(annotations);
+        }
+    }
+
+    private void writeCurrentValue(IonType type, IonReader reader) throws IOException {
+        switch (type) {
+            case BOOL:
+                final boolean booleanValue = reader.booleanValue();
+                writeBool(booleanValue);
+                break;
+            case INT:
+                switch (reader.getIntegerSize()) {
+                    case INT:
+                        final int intValue = reader.intValue();
+                        writeInt(intValue);
+                        break;
+                    case LONG:
+                        final long longValue = reader.longValue();
+                        writeInt(longValue);
+                        break;
+                    case BIG_INTEGER:
+                        final BigInteger bigIntegerValue = reader.bigIntegerValue();
+                        writeInt(bigIntegerValue);
+                        break;
+                    default:
+                        throw new IllegalStateException();
+                }
+                break;
+            case FLOAT:
+                final double doubleValue = reader.doubleValue();
+                writeFloat(doubleValue);
+                break;
+            case DECIMAL:
+                final Decimal decimalValue = reader.decimalValue();
+                writeDecimal(decimalValue);
+                break;
+            case TIMESTAMP:
+                final Timestamp timestampValue = reader.timestampValue();
+                writeTimestamp(timestampValue);
+                break;
+            case SYMBOL:
+                final SymbolToken symbolToken = reader.symbolValue();
+                writeSymbolToken(symbolToken);
+                break;
+            case STRING:
+                final String stringValue = reader.stringValue();
+                writeString(stringValue);
+                break;
+            case CLOB:
+                final byte[] clobValue = reader.newBytes();
+                writeClob(clobValue);
+                break;
+            case BLOB:
+                final byte[] blobValue = reader.newBytes();
+                writeBlob(blobValue);
+                break;
+            case LIST:
+            case SEXP:
+            case STRUCT:
+                reader.stepIn();
+                stepIn(type);
+                break;
+            default:
+                throw new IllegalStateException("Unexpected type: " + type);
         }
     }