Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Michael Blow has submitted this change and it was merged.
Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master'
..
Merge commit '2dc111d' from 'stabilization-f69489' into 'master'
Change-Id: I84505e94bdfc916d389288b36612081e778b1e53
---
M
hyracks-fullstack/hyracks/hyracks-dataflow-common/src/main/java/org/apache/hyracks/dataflow/common/data/partition/range/RangeMap.java
1 file changed, 5 insertions(+), 11 deletions(-)
Approvals:
Ali Alsuliman: Looks good to me, approved
Jenkins: Verified; No violations found; ; Verified
Objections:
Anon. E. Moose #1000171: Violations found
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..3719144 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
@@ -20,7 +20,6 @@
import java.io.Serializable;
import java.util.Arrays;
-import java.util.Objects;
/**
*
@@ -35,26 +34,21 @@
* endOffsets.length would be = 15
*
*/
-<<< 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 byte[] bytes;
private final int[] endOffsets;
public RangeMap(int numFields, byte[] bytes, int[] endOffsets) {
-this.numFields = numFields;
+this.fields = numFields;
this.bytes = bytes;
this.endOffsets = endOffsets;
}
public int getSplitCount() {
-return endOffsets.length / numFields;
+return endOffsets.length / fields;
}
public byte[] getByteArray() {
@@ -80,7 +74,7 @@
* @return the index of the desired split value that could be used with
{@code bytes} & {@code endOffsets}.
*/
private int getSplitValueIndex(int fieldIndex, int splitIndex) {
-return splitIndex * numFields + fieldIndex;
+return splitIndex * fields + fieldIndex;
}
/**
@@ -117,7 +111,7 @@
@Override
public int hashCode() {
-return numFields + Arrays.hashCode(bytes) +
Arrays.hashCode(endOffsets);
+return fields + Arrays.hashCode(bytes) + Arrays.hashCode(endOffsets);
}
@Override
@@ -129,7 +123,7 @@
return false;
}
RangeMap other = (RangeMap) object;
-return numFields == other.numFields && Arrays.equals(endOffsets,
other.endOffsets)
+return fields == other.fields && Arrays.equals(endOffsets,
other.endOffsets)
&& Arrays.equals(bytes, other.bytes);
}
}
--
To view, visit https://asterix-gerrit.ics.uci.edu/3148
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I84505e94bdfc916d389288b36612081e778b1e53
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow
Gerrit-Reviewer: Ali Alsuliman
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins
Gerrit-Reviewer: Michael Blow
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Anon. E. Moose #1000171 has posted comments on this change. Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Patch Set 2: Contrib-2 Analytics Compatibility Tests Failed https://goo.gl/VkFKDz : UNSTABLE -- To view, visit https://asterix-gerrit.ics.uci.edu/3148 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I84505e94bdfc916d389288b36612081e778b1e53 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Ali Alsuliman Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Jenkins has posted comments on this change. Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Patch Set 2: Integration-Tests+1 Integration Tests Successful https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/7868/ : SUCCESS -- To view, visit https://asterix-gerrit.ics.uci.edu/3148 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I84505e94bdfc916d389288b36612081e778b1e53 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Ali Alsuliman Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Jenkins has posted comments on this change. Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Patch Set 2: Contrib+1 BAD Compatibility Tests Successful https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/3943/ : SUCCESS -- To view, visit https://asterix-gerrit.ics.uci.edu/3148 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I84505e94bdfc916d389288b36612081e778b1e53 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Ali Alsuliman Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Jenkins has posted comments on this change. Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Patch Set 2: BAD Compatibility Tests Started https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/3943/ -- To view, visit https://asterix-gerrit.ics.uci.edu/3148 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I84505e94bdfc916d389288b36612081e778b1e53 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Ali Alsuliman Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Ali Alsuliman has posted comments on this change. Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Patch Set 2: Code-Review+2 -- To view, visit https://asterix-gerrit.ics.uci.edu/3148 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I84505e94bdfc916d389288b36612081e778b1e53 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Ali Alsuliman Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Jenkins has posted comments on this change. Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Patch Set 2: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-spidersilk-tests/155/ (15/15) -- To view, visit https://asterix-gerrit.ics.uci.edu/3148 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I84505e94bdfc916d389288b36612081e778b1e53 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Jenkins has posted comments on this change. Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Patch Set 2: Integration Tests Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/7868/ -- To view, visit https://asterix-gerrit.ics.uci.edu/3148 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I84505e94bdfc916d389288b36612081e778b1e53 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Jenkins has posted comments on this change. Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Patch Set 2: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-verify-storage/5617/ (13/15) -- To view, visit https://asterix-gerrit.ics.uci.edu/3148 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I84505e94bdfc916d389288b36612081e778b1e53 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Jenkins has posted comments on this change. Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Patch Set 2: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-asterix-app/5425/ (8/15) -- To view, visit https://asterix-gerrit.ics.uci.edu/3148 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I84505e94bdfc916d389288b36612081e778b1e53 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Jenkins has posted comments on this change. Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Patch Set 2: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-asterix-app-sql-execution/5050/ (14/15) -- To view, visit https://asterix-gerrit.ics.uci.edu/3148 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I84505e94bdfc916d389288b36612081e778b1e53 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Anon. E. Moose #1000171 has posted comments on this change. Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Patch Set 2: Analytics Compatibility Compilation Successful https://goo.gl/TfiwoU : SUCCESS -- To view, visit https://asterix-gerrit.ics.uci.edu/3148 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I84505e94bdfc916d389288b36612081e778b1e53 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Michael Blow has abandoned this change. Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Abandoned -- To view, visit https://asterix-gerrit.ics.uci.edu/3147 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I606c5a4522486c98c4724ccf4e28309b227d8212 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Jenkins has posted comments on this change. Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Patch Set 2: Build Started https://asterix-jenkins.ics.uci.edu/job/hyracks-gerrit/4954/ (1/15) -- To view, visit https://asterix-gerrit.ics.uci.edu/3148 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I84505e94bdfc916d389288b36612081e778b1e53 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Jenkins has posted comments on this change. Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Patch Set 2: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-ensure-ancestor/3052/ (2/15) -- To view, visit https://asterix-gerrit.ics.uci.edu/3148 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I84505e94bdfc916d389288b36612081e778b1e53 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Jenkins has posted comments on this change. Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Patch Set 2: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-cancellation-test/5042/ (5/15) -- To view, visit https://asterix-gerrit.ics.uci.edu/3148 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I84505e94bdfc916d389288b36612081e778b1e53 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Jenkins has posted comments on this change. Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Patch Set 2: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-no-installer-app/5372/ (10/15) -- To view, visit https://asterix-gerrit.ics.uci.edu/3148 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I84505e94bdfc916d389288b36612081e778b1e53 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Jenkins has posted comments on this change. Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Patch Set 2: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-verify-txnlog/208/ (6/15) -- To view, visit https://asterix-gerrit.ics.uci.edu/3148 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I84505e94bdfc916d389288b36612081e778b1e53 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Jenkins has posted comments on this change. Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Patch Set 2: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-source-assemblies/5265/ (3/15) -- To view, visit https://asterix-gerrit.ics.uci.edu/3148 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I84505e94bdfc916d389288b36612081e778b1e53 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Jenkins has posted comments on this change. Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Patch Set 2: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-asterix-app-openjdk11/445/ (11/15) -- To view, visit https://asterix-gerrit.ics.uci.edu/3148 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I84505e94bdfc916d389288b36612081e778b1e53 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Jenkins has posted comments on this change. Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Patch Set 2: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-sonar/8991/ (12/15) -- To view, visit https://asterix-gerrit.ics.uci.edu/3148 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I84505e94bdfc916d389288b36612081e778b1e53 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Jenkins has posted comments on this change. Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Patch Set 2: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-stabilization-f69489-compat/443/ (9/15) -- To view, visit https://asterix-gerrit.ics.uci.edu/3148 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I84505e94bdfc916d389288b36612081e778b1e53 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Hello Anon. E. Moose #1000171, Jenkins, I'd like you to reexamine a change. Please visit https://asterix-gerrit.ics.uci.edu/3148 to look at the new patch set (#2). Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Merge commit '2dc111d' from 'stabilization-f69489' into 'master' Change-Id: I84505e94bdfc916d389288b36612081e778b1e53 --- M hyracks-fullstack/hyracks/hyracks-dataflow-common/src/main/java/org/apache/hyracks/dataflow/common/data/partition/range/RangeMap.java 1 file changed, 5 insertions(+), 11 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/48/3148/2 -- To view, visit https://asterix-gerrit.ics.uci.edu/3148 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I84505e94bdfc916d389288b36612081e778b1e53 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Jenkins has posted comments on this change. Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Patch Set 2: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-source-format/5008/ (4/15) -- To view, visit https://asterix-gerrit.ics.uci.edu/3148 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I84505e94bdfc916d389288b36612081e778b1e53 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Jenkins has posted comments on this change. Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Patch Set 2: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/10524/ (7/15) -- To view, visit https://asterix-gerrit.ics.uci.edu/3148 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I84505e94bdfc916d389288b36612081e778b1e53 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Jenkins has posted comments on this change. Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Patch Set 1: Integration-Tests+1 Integration Tests Successful https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/7867/ : SUCCESS -- To view, visit https://asterix-gerrit.ics.uci.edu/3148 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I84505e94bdfc916d389288b36612081e778b1e53 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Anon. E. Moose #1000171 has posted comments on this change. Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Patch Set 1: Contrib-2 Analytics Compatibility Tests Failed https://goo.gl/NHch5H : UNSTABLE -- To view, visit https://asterix-gerrit.ics.uci.edu/3148 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I84505e94bdfc916d389288b36612081e778b1e53 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Jenkins has posted comments on this change. Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-spidersilk-tests/154/ (15/15) -- To view, visit https://asterix-gerrit.ics.uci.edu/3148 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I84505e94bdfc916d389288b36612081e778b1e53 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Anon. E. Moose #1000171 has posted comments on this change. Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Patch Set 1: Contrib-2 Analytics Compatibility Tests Failed https://goo.gl/yHFE37 : UNSTABLE -- To view, visit https://asterix-gerrit.ics.uci.edu/3147 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I606c5a4522486c98c4724ccf4e28309b227d8212 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Jenkins has posted comments on this change. Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Patch Set 1: Integration-Tests+1 Integration Tests Successful https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/7866/ : SUCCESS -- To view, visit https://asterix-gerrit.ics.uci.edu/3147 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I606c5a4522486c98c4724ccf4e28309b227d8212 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Jenkins has posted comments on this change. Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Patch Set 1: Integration Tests Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/7867/ -- To view, visit https://asterix-gerrit.ics.uci.edu/3148 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I84505e94bdfc916d389288b36612081e778b1e53 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Jenkins has posted comments on this change. Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-no-installer-app/5371/ (14/15) -- To view, visit https://asterix-gerrit.ics.uci.edu/3148 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I84505e94bdfc916d389288b36612081e778b1e53 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Jenkins has posted comments on this change. Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-asterix-app-sql-execution/5049/ (13/15) -- To view, visit https://asterix-gerrit.ics.uci.edu/3148 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I84505e94bdfc916d389288b36612081e778b1e53 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Jenkins has posted comments on this change. Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-cancellation-test/5041/ (7/15) -- To view, visit https://asterix-gerrit.ics.uci.edu/3148 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I84505e94bdfc916d389288b36612081e778b1e53 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Jenkins has posted comments on this change. Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-asterix-app-openjdk11/444/ (12/15) -- To view, visit https://asterix-gerrit.ics.uci.edu/3148 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I84505e94bdfc916d389288b36612081e778b1e53 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Jenkins has posted comments on this change. Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-sonar/8990/ (5/15) -- To view, visit https://asterix-gerrit.ics.uci.edu/3148 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I84505e94bdfc916d389288b36612081e778b1e53 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Anon. E. Moose #1000171 has posted comments on this change. Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Patch Set 1: Analytics Compatibility Compilation Successful https://goo.gl/XFAEEB : SUCCESS -- To view, visit https://asterix-gerrit.ics.uci.edu/3148 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I84505e94bdfc916d389288b36612081e778b1e53 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Jenkins has posted comments on this change. Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/10523/ (11/15) -- To view, visit https://asterix-gerrit.ics.uci.edu/3148 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I84505e94bdfc916d389288b36612081e778b1e53 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Jenkins has posted comments on this change. Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-stabilization-f69489-compat/442/ (1/15) -- To view, visit https://asterix-gerrit.ics.uci.edu/3148 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I84505e94bdfc916d389288b36612081e778b1e53 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Jenkins has posted comments on this change. Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-verify-txnlog/207/ (3/15) -- To view, visit https://asterix-gerrit.ics.uci.edu/3148 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I84505e94bdfc916d389288b36612081e778b1e53 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Jenkins has posted comments on this change. Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-source-assemblies/5264/ (8/15) -- To view, visit https://asterix-gerrit.ics.uci.edu/3148 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I84505e94bdfc916d389288b36612081e778b1e53 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Jenkins has posted comments on this change. Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-source-format/5007/ (10/15) -- To view, visit https://asterix-gerrit.ics.uci.edu/3148 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I84505e94bdfc916d389288b36612081e778b1e53 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Jenkins has posted comments on this change. Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-ensure-ancestor/3051/ (6/15) -- To view, visit https://asterix-gerrit.ics.uci.edu/3148 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I84505e94bdfc916d389288b36612081e778b1e53 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Jenkins has posted comments on this change. Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/hyracks-gerrit/4953/ (4/15) -- To view, visit https://asterix-gerrit.ics.uci.edu/3148 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I84505e94bdfc916d389288b36612081e778b1e53 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
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/3148
Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master'
..
Merge commit '2dc111d' from 'stabilization-f69489' into 'master'
Change-Id: I84505e94bdfc916d389288b36612081e778b1e53
---
M
hyracks-fullstack/hyracks/hyracks-dataflow-common/src/main/java/org/apache/hyracks/dataflow/common/data/partition/range/RangeMap.java
M
hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/CompatibilityUtil.java
2 files changed, 82 insertions(+), 20 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/48/3148/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..60e2ea9 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,16 @@
*/
package org.apache.hyracks.dataflow.common.data.partition.range;
+import static org.apache.hyracks.util.CompatibilityUtil.isAtLeast035;
+
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
import java.io.Serializable;
+import java.lang.reflect.Field;
import java.util.Arrays;
-import java.util.Objects;
+
+import org.apache.hyracks.util.CompatibilityUtil;
/**
*
@@ -35,15 +42,14 @@
* endOffsets.length would be = 15
*
*/
-<<< 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 static final Field numFieldsField =
CompatibilityUtil.getAccessibleField(RangeMap.class, "numFields");
+private static final Field bytesField =
CompatibilityUtil.getAccessibleField(RangeMap.class, "bytes");
+private static final Field endOffsetsField =
CompatibilityUtil.getAccessibleField(RangeMap.class, "endOffsets");
+
+private final int numFields;
private final byte[] bytes;
private final int[] endOffsets;
@@ -73,8 +79,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 +140,26 @@
return numFields == other.numFields && Arrays.equals(endOffsets,
other.endOffsets)
&& Arrays.equals(bytes, other.bytes);
}
+
+private void writeObject(java.io.ObjectOutputStream out) throws
IOException {
+ObjectOutputStream.PutField fields = out.putFields();
+fields.put("bytes", bytes);
+fields.put("numFields", numFields);
+fields.put("endOffsets", endOffsets);
+if (!isAtLeast035()) {
+fields.put("fields", numFields);
+}
+out.writeFields();
+}
+
+private void readObject(java.io.ObjectInputStream in) throws IOException,
ClassNotFoundException {
+ObjectInputStream.GetField fields = in.readFields();
+if (!isAtLeast035() && fields.defaulted("numFields")) {
+CompatibilityUtil.writeField(this, numFieldsField,
fields.get("fields", 0));
+} else {
+CompatibilityUtil.writeField(this, numFieldsField,
fields.get("numFields", 0));
+}
+CompatibilityUtil.writeField(this, bytesField, fields.get("bytes",
null));
+CompatibilityUtil.writeField(this, endOffsetsField,
fields.get("endOffsets", null));
+}
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/CompatibilityUtil.java
b/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/CompatibilityUtil.java
index 65da9fe..f83a175 100644
---
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Jenkins has posted comments on this change. Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-verify-storage/5616/ (2/15) -- To view, visit https://asterix-gerrit.ics.uci.edu/3148 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I84505e94bdfc916d389288b36612081e778b1e53 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Jenkins has posted comments on this change. Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-asterix-app/5424/ (9/15) -- To view, visit https://asterix-gerrit.ics.uci.edu/3148 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I84505e94bdfc916d389288b36612081e778b1e53 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Jenkins has posted comments on this change. Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-spidersilk-tests/153/ (15/15) -- To view, visit https://asterix-gerrit.ics.uci.edu/3147 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I606c5a4522486c98c4724ccf4e28309b227d8212 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Jenkins has posted comments on this change. Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Patch Set 1: Integration Tests Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/7866/ -- To view, visit https://asterix-gerrit.ics.uci.edu/3147 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I606c5a4522486c98c4724ccf4e28309b227d8212 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Jenkins has posted comments on this change. Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-verify-storage/5615/ (3/15) -- To view, visit https://asterix-gerrit.ics.uci.edu/3147 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I606c5a4522486c98c4724ccf4e28309b227d8212 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Jenkins has posted comments on this change. Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-source-assemblies/5263/ (7/15) -- To view, visit https://asterix-gerrit.ics.uci.edu/3147 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I606c5a4522486c98c4724ccf4e28309b227d8212 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Anon. E. Moose #1000171 has posted comments on this change. Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Patch Set 1: Analytics Compatibility Compilation Successful https://goo.gl/c1LRFn : SUCCESS -- To view, visit https://asterix-gerrit.ics.uci.edu/3147 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I606c5a4522486c98c4724ccf4e28309b227d8212 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Jenkins has posted comments on this change. Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-asterix-app-sql-execution/5048/ (14/15) -- To view, visit https://asterix-gerrit.ics.uci.edu/3147 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I606c5a4522486c98c4724ccf4e28309b227d8212 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Jenkins has posted comments on this change. Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-no-installer-app/5370/ (2/15) -- To view, visit https://asterix-gerrit.ics.uci.edu/3147 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I606c5a4522486c98c4724ccf4e28309b227d8212 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Jenkins has posted comments on this change. Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-asterix-app-openjdk11/443/ (5/15) -- To view, visit https://asterix-gerrit.ics.uci.edu/3147 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I606c5a4522486c98c4724ccf4e28309b227d8212 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Jenkins has posted comments on this change. Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-sonar/8989/ (4/15) -- To view, visit https://asterix-gerrit.ics.uci.edu/3147 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I606c5a4522486c98c4724ccf4e28309b227d8212 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Jenkins has posted comments on this change. Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-ensure-ancestor/3050/ (6/15) -- To view, visit https://asterix-gerrit.ics.uci.edu/3147 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I606c5a4522486c98c4724ccf4e28309b227d8212 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Jenkins has posted comments on this change. Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/10522/ (11/15) -- To view, visit https://asterix-gerrit.ics.uci.edu/3147 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I606c5a4522486c98c4724ccf4e28309b227d8212 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Jenkins has posted comments on this change. Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-cancellation-test/5040/ (10/15) -- To view, visit https://asterix-gerrit.ics.uci.edu/3147 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I606c5a4522486c98c4724ccf4e28309b227d8212 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Jenkins has posted comments on this change. Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-asterix-app/5423/ (8/15) -- To view, visit https://asterix-gerrit.ics.uci.edu/3147 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I606c5a4522486c98c4724ccf4e28309b227d8212 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Jenkins has posted comments on this change. Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-verify-txnlog/206/ (13/15) -- To view, visit https://asterix-gerrit.ics.uci.edu/3147 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I606c5a4522486c98c4724ccf4e28309b227d8212 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Jenkins has posted comments on this change. Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/hyracks-gerrit/4952/ (9/15) -- To view, visit https://asterix-gerrit.ics.uci.edu/3147 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I606c5a4522486c98c4724ccf4e28309b227d8212 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Jenkins has posted comments on this change. Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-stabilization-f69489-compat/441/ (1/15) -- To view, visit https://asterix-gerrit.ics.uci.edu/3147 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I606c5a4522486c98c4724ccf4e28309b227d8212 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
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;
/**
*
@@ -35,17 +39,14 @@
* endOffsets.length would be = 15
*
*/
-<<< 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
Change in asterixdb[master]: Merge commit '2dc111d' from 'stabilization-f69489' into 'mas...
Jenkins has posted comments on this change. Change subject: Merge commit '2dc111d' from 'stabilization-f69489' into 'master' .. Patch Set 1: Build Started https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-source-format/5006/ (12/15) -- To view, visit https://asterix-gerrit.ics.uci.edu/3147 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: comment Gerrit-Change-Id: I606c5a4522486c98c4724ccf4e28309b227d8212 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Jenkins Gerrit-HasComments: No
