[incubator-pulsar] branch master updated: S3Offload datablock magic word should be negative (#1753)

[si...@apache.org]

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 e695c82  S3Offload datablock magic word should be negative (#1753)
e695c82 is described below

commit e695c82b4bfa2a98f92f52dd58eda0fa48833146
Author: Ivan Kelly <iv...@apache.org>
AuthorDate: Thu May 10 08:16:28 2018 +0200

    S3Offload datablock magic word should be negative (#1753)
    
    * S3Offload datablock magic word should be negative
    
    When reading in a bunch of blocks, we need to know when we've hit the
    next block or padding. To identify padding, we just check if the read
    in value is negative. Hitting the magic word for a new block should do
    the same.
    
    Master Issue: #1511
    
    * fix unit test
---
 .../org/apache/pulsar/broker/s3offload/impl/DataBlockHeaderImpl.java    | 2 +-
 .../org/apache/pulsar/broker/s3offload/impl/DataBlockHeaderTest.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/s3offload/impl/DataBlockHeaderImpl.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/s3offload/impl/DataBlockHeaderImpl.java
index 5413cf7..6ea1f29 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/s3offload/impl/DataBlockHeaderImpl.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/s3offload/impl/DataBlockHeaderImpl.java
@@ -35,7 +35,7 @@ import org.apache.pulsar.broker.s3offload.DataBlockHeader;
 public class DataBlockHeaderImpl implements DataBlockHeader {
     // Magic Word for data block.
     // It is a sequence of bytes used to identify the start of a block.
-    private static final int MAGIC_WORD = 0xDBDBDBDB;
+    static final int MAGIC_WORD = 0xFBDBABCB;
     // This is bigger than header size. Leaving some place for alignment and future enhancement.
     // Payload use this as the start offset.
     private static final int HEADER_MAX_SIZE = 128;
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/s3offload/impl/DataBlockHeaderTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/s3offload/impl/DataBlockHeaderTest.java
index c070420..f3515ed 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/s3offload/impl/DataBlockHeaderTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/s3offload/impl/DataBlockHeaderTest.java
@@ -41,7 +41,7 @@ public class DataBlockHeaderTest {
             firstEntryId);
 
         // verify get methods
-        assertEquals(dataBlockHeader.getBlockMagicWord(), 0xDBDBDBDB);
+        assertEquals(dataBlockHeader.getBlockMagicWord(), DataBlockHeaderImpl.MAGIC_WORD);
         assertEquals(dataBlockHeader.getBlockLength(), headerLength);
         assertEquals(dataBlockHeader.getFirstEntryId(), firstEntryId);
 

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