Fix misplacement of originatingHostId in stats metadata

patch by Jacek Lewandowski; reviewed by Benjamin Lerer for CASSANDRA-16619

src/java/org/apache/cassandra/io/sstable/metadata/StatsMetadata.java

@@ -285,12 +285,6 @@ public int serializedSize(Version version, StatsMetadata component) throws IOExc
                 size += CommitLogPosition.serializer.serializedSize(component.commitLogIntervals.lowerBound().orElse(CommitLogPosition.NONE));
             if (version.hasCommitLogIntervals())
                 size += commitLogPositionSetSerializer.serializedSize(component.commitLogIntervals);
-            if (version.hasOriginatingHostId())
-            {
-                size += 1; // boolean: is originatingHostId present
-                if (component.originatingHostId != null)
-                    size += UUIDSerializer.serializer.serializedSize(component.originatingHostId, version.correspondingMessagingVersion());
-            }
 
             if (version.hasPendingRepair())
             {
@@ -304,6 +298,13 @@ public int serializedSize(Version version, StatsMetadata component) throws IOExc
                 size += TypeSizes.sizeof(component.isTransient);
             }
 
+            if (version.hasOriginatingHostId())
+            {
+                size += 1; // boolean: is originatingHostId present
+                if (component.originatingHostId != null)
+                    size += UUIDSerializer.serializer.serializedSize(component.originatingHostId, version.correspondingMessagingVersion());
+            }
+
             return size;
         }
 
@@ -337,36 +338,37 @@ public void serialize(Version version, StatsMetadata component, DataOutputPlus o
                 CommitLogPosition.serializer.serialize(component.commitLogIntervals.lowerBound().orElse(CommitLogPosition.NONE), out);
             if (version.hasCommitLogIntervals())
                 commitLogPositionSetSerializer.serialize(component.commitLogIntervals, out);
-            if (version.hasOriginatingHostId())
+
+            if (version.hasPendingRepair())
             {
-                if (component.originatingHostId != null)
+                if (component.pendingRepair != null)
                 {
                     out.writeByte(1);
-                    UUIDSerializer.serializer.serialize(component.originatingHostId, out, 0);
+                    UUIDSerializer.serializer.serialize(component.pendingRepair, out, 0);
                 }
                 else
                 {
                     out.writeByte(0);
                 }
             }
 
-            if (version.hasPendingRepair())
+            if (version.hasIsTransient())
             {
-                if (component.pendingRepair != null)
+                out.writeBoolean(component.isTransient);
+            }
+
+            if (version.hasOriginatingHostId())
+            {
+                if (component.originatingHostId != null)
                 {
                     out.writeByte(1);
-                    UUIDSerializer.serializer.serialize(component.pendingRepair, out, 0);
+                    UUIDSerializer.serializer.serialize(component.originatingHostId, out, 0);
                 }
                 else
                 {
                     out.writeByte(0);
                 }
             }
-
-            if (version.hasIsTransient())
-            {
-                out.writeBoolean(component.isTransient);
-            }
         }
 
         public StatsMetadata deserialize(Version version, DataInputPlus in) throws IOException
@@ -439,10 +441,6 @@ public StatsMetadata deserialize(Version version, DataInputPlus in) throws IOExc
             else
                 commitLogIntervals = new IntervalSet<CommitLogPosition>(commitLogLowerBound, commitLogUpperBound);
 
-            UUID originatingHostId = null;
-            if (version.hasOriginatingHostId() && in.readByte() != 0)
-                originatingHostId = UUIDSerializer.serializer.deserialize(in, 0);
-
             UUID pendingRepair = null;
             if (version.hasPendingRepair() && in.readByte() != 0)
             {
@@ -451,6 +449,10 @@ public StatsMetadata deserialize(Version version, DataInputPlus in) throws IOExc
 
             boolean isTransient = version.hasIsTransient() && in.readBoolean();
 
+            UUID originatingHostId = null;
+            if (version.hasOriginatingHostId() && in.readByte() != 0)
+                originatingHostId = UUIDSerializer.serializer.deserialize(in, 0);
+
             return new StatsMetadata(partitionSizes,
                                      columnCounts,
                                      commitLogIntervals,

test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust/nb-1-big-Digest.crc32

@@ -1 +1 @@
-1209240663
+2568411107

test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust/nb-1-big-TOC.txt

@@ -1,8 +1,8 @@
-Data.db
-Filter.db
-Statistics.db
-TOC.txt
-Digest.crc32
 CompressionInfo.db
 Index.db
+TOC.txt
+Filter.db
 Summary.db
+Statistics.db
+Digest.crc32
+Data.db

test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust_counter/nb-1-big-Digest.crc32

@@ -1 +1 @@
-38943571
+1235552564

test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust_counter/nb-1-big-TOC.txt

@@ -1,8 +1,8 @@
-Data.db
-Filter.db
-Statistics.db
-TOC.txt
-Digest.crc32
 CompressionInfo.db
 Index.db
+TOC.txt
+Filter.db
 Summary.db
+Statistics.db
+Digest.crc32
+Data.db

test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-1-big-Digest.crc32

@@ -1 +1 @@
-2668536242
+3400459090

test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-1-big-TOC.txt

@@ -1,8 +1,8 @@
-Data.db
-Filter.db
-Statistics.db
-TOC.txt
-Digest.crc32
 CompressionInfo.db
 Index.db
+TOC.txt
+Filter.db
 Summary.db
+Statistics.db
+Digest.crc32
+Data.db

test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple_counter/nb-1-big-Digest.crc32

@@ -1 +1 @@
-3976252352
+516618312

test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple_counter/nb-1-big-TOC.txt

@@ -1,8 +1,8 @@
-Data.db
-Filter.db
-Statistics.db
-TOC.txt
-Digest.crc32
 CompressionInfo.db
 Index.db
+TOC.txt
+Filter.db
 Summary.db
+Statistics.db
+Digest.crc32
+Data.db