More reorder

Author: Tim-Brooks

server/src/main/java/org/elasticsearch/index/translog/Translog.java

@@ -1276,9 +1276,9 @@ private static Index readFrom(StreamInput in) throws IOException {
                 primaryTerm = in.readLong();
             } else {
                 version = in.readLong();
-                autoGeneratedIdTimestamp = in.readLong();
                 seqNo = in.readLong();
                 primaryTerm = in.readLong();
+                autoGeneratedIdTimestamp = in.readLong();
                 uid = in.readBytesRef();
                 routing = in.readOptionalString();
                 source = in.readBytesReference();
@@ -1360,9 +1360,9 @@ public long version() {
         protected void writeHeader(int format, StreamOutput out) throws IOException {
             out.writeVInt(format);
             out.writeLong(version);
-            out.writeLong(autoGeneratedIdTimestamp);
             out.writeLong(seqNo);
             out.writeLong(primaryTerm);
+            out.writeLong(autoGeneratedIdTimestamp);
             out.writeBytesRef(uid);
             out.writeOptionalString(routing);
             out.writeVInt(source == null ? 0 : source.length());

server/src/main/java/org/elasticsearch/index/translog/TranslogHeaderWriter.java

@@ -28,6 +28,15 @@ public final class TranslogHeaderWriter {
     public static final int FIXED_DELETE_HEADER_SIZE = 30;
     public static final int FIXED_NO_OP_HEADER_SIZE = 21;
 
+    public static final int OPERATION_TYPE_OFFSET = 4;
+    public static final int SERIALIZATION_FORMAT_OFFSET = 5;
+    public static final int VERSION_OFFSET = 6;
+    public static final int SEQ_NO_OFFSET = 14;
+    public static final int PRIMARY_TERM_OFFSET = 22;
+
+    public static final int INDEX_AUTO_GENERATED_ID_TIMESTAMP_OFFSET = 30;
+    public static final int INDEX_UID_LENGTH_OFFSET = 38;
+
     private TranslogHeaderWriter() {
         // This class depends on the serialization format fitting in a single vInt byte. If we advance pass 127 we need to tweak the logic
         // to write 2 bytes.
@@ -53,16 +62,16 @@ private static void writeFastIndexHeader(RecyclerBytesStreamOutput buffer, Trans
 
         int off = page.offset;
         byte[] bytes = page.bytes;
-        bytes[off + 4] = Translog.Operation.Type.INDEX.id();
+        bytes[off + OPERATION_TYPE_OFFSET] = Translog.Operation.Type.INDEX.id();
         // This is technically a vInt in the serialization, but until we advance past 127 we can just directly serialize as a byte
-        bytes[off + 5] = (byte) Translog.Index.SERIALIZATION_FORMAT;
-        ByteUtils.writeLongBE(index.version(), bytes, off + 6);
-        ByteUtils.writeLongBE(index.getAutoGeneratedIdTimestamp(), bytes, off + 14);
-        ByteUtils.writeLongBE(index.seqNo(), bytes, off + 22);
-        ByteUtils.writeLongBE(index.primaryTerm(), bytes, off + 30);
-        StreamOutput.putVInt(bytes, uid.length, off + 38);
-        System.arraycopy(uid.bytes, uid.offset, bytes, off + 38 + uidVIntLen, uid.length);
-        bytes[off + 38 + uidVIntLen + uid.length] = index.routing() == null ? (byte) 0 : (byte) 1;
+        bytes[off + SERIALIZATION_FORMAT_OFFSET] = (byte) Translog.Index.SERIALIZATION_FORMAT;
+        ByteUtils.writeLongBE(index.version(), bytes, off + VERSION_OFFSET);
+        ByteUtils.writeLongBE(index.seqNo(), bytes, off + SEQ_NO_OFFSET);
+        ByteUtils.writeLongBE(index.primaryTerm(), bytes, off + PRIMARY_TERM_OFFSET);
+        ByteUtils.writeLongBE(index.getAutoGeneratedIdTimestamp(), bytes, off + INDEX_AUTO_GENERATED_ID_TIMESTAMP_OFFSET);
+        StreamOutput.putVInt(bytes, uid.length, off + INDEX_UID_LENGTH_OFFSET);
+        System.arraycopy(uid.bytes, uid.offset, bytes, off + INDEX_UID_LENGTH_OFFSET + uidVIntLen, uid.length);
+        bytes[off + INDEX_UID_LENGTH_OFFSET + uidVIntLen + uid.length] = index.routing() == null ? (byte) 0 : (byte) 1;
 
         long variableLengthStart = buffer.position();
         // Write variable length items in header
@@ -111,12 +120,12 @@ private static void writeFastDeleteHeader(Translog.Delete delete, BytesRef page,
 
         int off = page.offset;
         byte[] bytes = page.bytes;
-        bytes[off + 4] = Translog.Operation.Type.DELETE.id();
+        bytes[off + OPERATION_TYPE_OFFSET] = Translog.Operation.Type.DELETE.id();
         // This is technically a vInt in the serialization, but until we advance past 127 we can just directly serialize as a byte
-        bytes[off + 5] = (byte) Translog.Delete.SERIALIZATION_FORMAT;
-        ByteUtils.writeLongBE(delete.version(), bytes, off + 6);
-        ByteUtils.writeLongBE(delete.seqNo(), bytes, off + 14);
-        ByteUtils.writeLongBE(delete.primaryTerm(), bytes, off + 22);
+        bytes[off + SERIALIZATION_FORMAT_OFFSET] = (byte) Translog.Delete.SERIALIZATION_FORMAT;
+        ByteUtils.writeLongBE(delete.version(), bytes, off + VERSION_OFFSET);
+        ByteUtils.writeLongBE(delete.seqNo(), bytes, off + SEQ_NO_OFFSET);
+        ByteUtils.writeLongBE(delete.primaryTerm(), bytes, off + PRIMARY_TERM_OFFSET);
         StreamOutput.putVInt(bytes, uid.length, off + FIXED_DELETE_HEADER_SIZE);
         System.arraycopy(uid.bytes, uid.offset, bytes, off + FIXED_DELETE_HEADER_SIZE + uidVIntLen, uid.length);
 
@@ -142,7 +151,7 @@ public static void writeNoOpHeader(RecyclerBytesStreamOutput buffer, Translog.No
         if (bytesRef != null) {
             int off = bytesRef.offset;
             byte[] bytes = bytesRef.bytes;
-            bytes[off + 4] = Translog.Operation.Type.NO_OP.id();
+            bytes[off + OPERATION_TYPE_OFFSET] = Translog.Operation.Type.NO_OP.id();
             ByteUtils.writeLongBE(noop.seqNo(), bytes, off + 5);
             ByteUtils.writeLongBE(noop.primaryTerm(), bytes, off + 13);