You are viewing a plain text version of this content. The canonical link for it is here.

Posted to notifications@asterixdb.apache.org by "Michael Blow (Code Review)" <do...@asterixdb.incubator.apache.org> on 2019/02/04 15:19:53 UTC

Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...

Michael Blow has uploaded a new change for review.

  https://asterix-gerrit.ics.uci.edu/3147

Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master'
......................................................................

Merge commit '2dc111d' from 'stabilization-f69489' into 'master'

Change-Id: I606c5a4522486c98c4724ccf4e28309b227d8212
---
M hyracks-fullstack/hyracks/hyracks-dataflow-common/src/main/java/org/apache/hyracks/dataflow/common/data/partition/range/RangeMap.java
1 file changed, 29 insertions(+), 8 deletions(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/47/3147/1

diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/main/java/org/apache/hyracks/dataflow/common/data/partition/range/RangeMap.java b/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/main/java/org/apache/hyracks/dataflow/common/data/partition/range/RangeMap.java
index 05f0e15..e37f98f 100644
--- a/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/main/java/org/apache/hyracks/dataflow/common/data/partition/range/RangeMap.java
+++ b/hyracks-fullstack/hyracks/hyracks-dataflow-common/src/main/java/org/apache/hyracks/dataflow/common/data/partition/range/RangeMap.java
@@ -18,9 +18,13 @@
  */
 package org.apache.hyracks.dataflow.common.data.partition.range;
 
+import static org.apache.hyracks.util.CompatibilityUtil.isAtLeast035;
+
+import java.io.IOException;
 import java.io.Serializable;
 import java.util.Arrays;
-import java.util.Objects;
+
+import org.apache.hyracks.util.CompatibilityUtil;
 
 /**
  * <pre>
@@ -35,17 +39,14 @@
  * endOffsets.length would be = 15
  * </pre>
  */
-<<<<<<< HEAD   (53a5c2 [NO ISSUE] Compatibility improvements, misc cleanup / refact)
 public class RangeMap implements Serializable {
-    private final int numFields;
-=======
-public class RangeMap implements IRangeMap, Serializable {
     private static final long serialVersionUID = -7523433293419648234L;
 
-    private final int fields;
->>>>>>> BRANCH (2dc111 [NO ISSUE] Ensure serialVersionUIDs are present)
+    private final int numFields;
     private final byte[] bytes;
     private final int[] endOffsets;
+    @Deprecated // retained for backward compatibility w/ 0.3.4
+    private final int fields = 0;
 
     public RangeMap(int numFields, byte[] bytes, int[] endOffsets) {
         this.numFields = numFields;
@@ -73,8 +74,10 @@
         return getSplitValueLength(getSplitValueIndex(fieldIndex, splitIndex));
     }
 
-    /** Translates fieldIndex & splitIndex into an index which is used to find information about that split value.
+    /**
+     * Translates fieldIndex & splitIndex into an index which is used to find information about that split value.
      * The combination of a fieldIndex & splitIndex uniquely identifies a split value of interest.
+     *
      * @param fieldIndex the field index within the splitIndex of interest (0 <= fieldIndex < numFields)
      * @param splitIndex starts with 0,1,2,.. etc
      * @return the index of the desired split value that could be used with {@code bytes} & {@code endOffsets}.
@@ -132,4 +135,22 @@
         return numFields == other.numFields && Arrays.equals(endOffsets, other.endOffsets)
                 && Arrays.equals(bytes, other.bytes);
     }
+
+    private void writeObject(java.io.ObjectOutputStream out)
+            throws IOException {
+        if (!isAtLeast035()) {
+            // for backward compatibility
+            CompatibilityUtil.writeField(this, "fields", numFields);
+        }
+        out.defaultWriteObject();
+    }
+
+    private void readObject(java.io.ObjectInputStream in)
+            throws IOException, ClassNotFoundException {
+        in.defaultReadObject();
+        // for backward compatibility
+        if (!isAtLeast035() && numFields == 0) {
+            CompatibilityUtil.writeField(this, "numFields", fields);
+        }
+    }
 }

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/3147
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I606c5a4522486c98c4724ccf4e28309b227d8212
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <mb...@apache.org>