[incubator-pulsar] branch master updated: OffloadIndex should have metadata len immediately before metadata (#1911)

[sijie]

This is an automated email from the ASF dual-hosted git repository.

sijie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pulsar.git


The following commit(s) were added to refs/heads/master by this push:
     new 3e74aff  OffloadIndex should have metadata len immediately before 
metadata (#1911)
3e74aff is described below

commit 3e74affc869b60a5ce347bd9af1d0ac9842de876
Author: Ivan Kelly <iv...@apache.org>
AuthorDate: Sat Jun 9 21:45:08 2018 +0200

    OffloadIndex should have metadata len immediately before metadata (#1911)
    
    Previous to this patch, we had the metadata length, then the index
    entry count, then the metadata. That's weird.
    
    This patch moves the metadata length to immediately before the
    metadata.
    
    Master Issue: #1511
---
 .../pulsar/broker/s3offload/impl/OffloadIndexBlockImpl.java | 13 ++++++-------
 .../pulsar/broker/s3offload/impl/OffloadIndexTest.java      |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git 
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/s3offload/impl/OffloadIndexBlockImpl.java
 
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/s3offload/impl/OffloadIndexBlockImpl.java
index d0e7239..e910150 100644
--- 
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/s3offload/impl/OffloadIndexBlockImpl.java
+++ 
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/s3offload/impl/OffloadIndexBlockImpl.java
@@ -167,8 +167,8 @@ public class OffloadIndexBlockImpl implements 
OffloadIndexBlock {
     /**
      * Get the content of the index block as InputStream.
      * Read out in format:
-     *   | index_magic_header | index_block_len | index_entry_count |
-     *   |segment_metadata_len | segment metadata | index entries |
+     *   | index_magic_header | index_block_len | data_object_len | 
data_header_len |
+     *   | index_entry_count  | segment_metadata_len | segment metadata | 
index entries... |
      */
     @Override
     public OffloadIndexBlock.IndexInputStream toStream() throws IOException {
@@ -180,8 +180,8 @@ public class OffloadIndexBlockImpl implements 
OffloadIndexBlock {
             + 4 /* index block length */
             + 8 /* data object length */
             + 8 /* data header length */
-            + 4 /* segment metadata length */
             + 4 /* index entry count */
+            + 4 /* segment metadata length */
             + segmentMetadataLength
             + indexEntryCount * (8 + 4 + 8); /* messageEntryId + blockPartId + 
blockOffset */
 
@@ -191,9 +191,8 @@ public class OffloadIndexBlockImpl implements 
OffloadIndexBlock {
             .writeInt(indexBlockLength)
             .writeLong(dataObjectLength)
             .writeLong(dataHeaderLength)
-            .writeInt(segmentMetadataLength)
-            .writeInt(indexEntryCount);
-
+            .writeInt(indexEntryCount)
+            .writeInt(segmentMetadataLength);
         // write metadata
         out.writeBytes(ledgerMetadataByte);
 
@@ -331,8 +330,8 @@ public class OffloadIndexBlockImpl implements 
OffloadIndexBlock {
         int indexBlockLength = dis.readInt();
         this.dataObjectLength = dis.readLong();
         this.dataHeaderLength = dis.readLong();
-        int segmentMetadataLength = dis.readInt();
         int indexEntryCount = dis.readInt();
+        int segmentMetadataLength = dis.readInt();
 
         byte[] metadataBytes = new byte[segmentMetadataLength];
 
diff --git 
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/s3offload/impl/OffloadIndexTest.java
 
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/s3offload/impl/OffloadIndexTest.java
index cff4045..445ba01 100644
--- 
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/s3offload/impl/OffloadIndexTest.java
+++ 
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/s3offload/impl/OffloadIndexTest.java
@@ -165,8 +165,8 @@ public class OffloadIndexTest {
         int indexBlockLength = wrapper.readInt();
         long dataObjectLength = wrapper.readLong();
         long dataHeaderLength = wrapper.readLong();
-        int segmentMetadataLength = wrapper.readInt();
         int indexEntryCount = wrapper.readInt();
+        int segmentMetadataLength = wrapper.readInt();
 
         // verify counter
         assertEquals(magic, OffloadIndexBlockImpl.getIndexMagicWord());

-- 
To stop receiving notification emails like this one, please contact
si...@apache.org.