You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@asterixdb.apache.org by "Ian Maxon (Code Review)" <do...@asterixdb.incubator.apache.org> on 2015/11/30 21:24:00 UTC
Change in hyracks[master]: Fix for ASTERIXDB-1200
Ian Maxon has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/524
Change subject: Fix for ASTERIXDB-1200
......................................................................
Fix for ASTERIXDB-1200
Fixes an issue where in the Hyracks integration tests,
if the result size is 0, a NPE is thrown instead of
an assert passing or failing.
Change-Id: Ib519882b9cbca941addcd66232c176a2eaeecc4b
---
M hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/AbstractIntegrationTest.java
1 file changed, 4 insertions(+), 2 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/hyracks refs/changes/24/524/1
diff --git a/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/AbstractIntegrationTest.java b/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/AbstractIntegrationTest.java
index 44dc231..415a88f 100644
--- a/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/AbstractIntegrationTest.java
+++ b/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/AbstractIntegrationTest.java
@@ -145,7 +145,6 @@
hcc.waitForCompletion(jobId);
}
-
protected List<String> readResults(JobSpecification spec, JobId jobId, ResultSetId resultSetId) throws Exception {
int nReaders = 1;
@@ -197,6 +196,9 @@
Assert.assertEquals(expectedLine, actualLine);
j++;
}
+ //We expect some sort of result.
+ Assert.assertTrue(j > 0);
+ //We also expect the same amount of results.
Assert.assertEquals(j, results.size());
expectedFile.close();
}
@@ -212,7 +214,7 @@
List<String> results;
for (int i = 0; i < spec.getResultSetIds().size(); i++) {
results = readResults(spec, jobId, spec.getResultSetIds().get(i));
- for(String str : results) {
+ for (String str : results) {
output.write(str);
}
}
--
To view, visit https://asterix-gerrit.ics.uci.edu/524
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib519882b9cbca941addcd66232c176a2eaeecc4b
Gerrit-PatchSet: 1
Gerrit-Project: hyracks
Gerrit-Branch: master
Gerrit-Owner: Ian Maxon <im...@apache.org>
Change in hyracks[master]: Fix for ASTERIXDB-1200
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Fix for ASTERIXDB-1200
......................................................................
Patch Set 1:
Build Started https://asterix-jenkins.ics.uci.edu/job/hyracks-gerrit/631/
--
To view, visit https://asterix-gerrit.ics.uci.edu/524
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ib519882b9cbca941addcd66232c176a2eaeecc4b
Gerrit-PatchSet: 1
Gerrit-Project: hyracks
Gerrit-Branch: master
Gerrit-Owner: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in hyracks[master]: Fix for ASTERIXDB-1200
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Fix for ASTERIXDB-1200
......................................................................
Patch Set 2: Verified+1
Build Successful
https://asterix-jenkins.ics.uci.edu/job/hyracks-gerrit/724/ : SUCCESS
--
To view, visit https://asterix-gerrit.ics.uci.edu/524
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ib519882b9cbca941addcd66232c176a2eaeecc4b
Gerrit-PatchSet: 2
Gerrit-Project: hyracks
Gerrit-Branch: master
Gerrit-Owner: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: Yingyi Bu <bu...@gmail.com>
Gerrit-HasComments: No
Change in hyracks[master]: Fix for ASTERIXDB-1200
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Fix for ASTERIXDB-1200
......................................................................
Patch Set 1: Verified+1
Build Successful
https://asterix-jenkins.ics.uci.edu/job/hyracks-gerrit/631/ : SUCCESS
--
To view, visit https://asterix-gerrit.ics.uci.edu/524
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ib519882b9cbca941addcd66232c176a2eaeecc4b
Gerrit-PatchSet: 1
Gerrit-Project: hyracks
Gerrit-Branch: master
Gerrit-Owner: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in hyracks[master]: Fix for ASTERIXDB-1200
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: Fix for ASTERIXDB-1200
......................................................................
Patch Set 2:
Build Started https://asterix-jenkins.ics.uci.edu/job/hyracks-gerrit/724/
--
To view, visit https://asterix-gerrit.ics.uci.edu/524
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ib519882b9cbca941addcd66232c176a2eaeecc4b
Gerrit-PatchSet: 2
Gerrit-Project: hyracks
Gerrit-Branch: master
Gerrit-Owner: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: Yingyi Bu <bu...@gmail.com>
Gerrit-HasComments: No
Change in hyracks[master]: Fix for ASTERIXDB-1200
Posted by "Ian Maxon (Code Review)" <do...@asterixdb.incubator.apache.org>.
Ian Maxon has submitted this change and it was merged.
Change subject: Fix for ASTERIXDB-1200
......................................................................
Fix for ASTERIXDB-1200
Fixes an issue where in the Hyracks integration tests,
if the result size is 0, a NPE is thrown instead of
an assert passing or failing.
Change-Id: Ib519882b9cbca941addcd66232c176a2eaeecc4b
Reviewed-on: https://asterix-gerrit.ics.uci.edu/524
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Till Westmann <ti...@apache.org>
---
M hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/AbstractIntegrationTest.java
1 file changed, 7 insertions(+), 3 deletions(-)
Approvals:
Till Westmann: Looks good to me, approved
Jenkins: Verified
diff --git a/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/AbstractIntegrationTest.java b/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/AbstractIntegrationTest.java
index 44dc231..7a339b7 100644
--- a/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/AbstractIntegrationTest.java
+++ b/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/AbstractIntegrationTest.java
@@ -145,7 +145,6 @@
hcc.waitForCompletion(jobId);
}
-
protected List<String> readResults(JobSpecification spec, JobId jobId, ResultSetId resultSetId) throws Exception {
int nReaders = 1;
@@ -190,6 +189,10 @@
results = readResults(spec, jobId, spec.getResultSetIds().get(i));
BufferedReader expectedFile = new BufferedReader(new FileReader(expectedFileNames[i]));
+ //We're expecting some sort of result.
+ Assert.assertTrue(results != null);
+ Assert.assertTrue(results.size() > 0);
+
String expectedLine, actualLine;
int j = 0;
while ((expectedLine = expectedFile.readLine()) != null) {
@@ -197,6 +200,7 @@
Assert.assertEquals(expectedLine, actualLine);
j++;
}
+ //We also expect the same amount of results.
Assert.assertEquals(j, results.size());
expectedFile.close();
}
@@ -212,7 +216,7 @@
List<String> results;
for (int i = 0; i < spec.getResultSetIds().size(); i++) {
results = readResults(spec, jobId, spec.getResultSetIds().get(i));
- for(String str : results) {
+ for (String str : results) {
output.write(str);
}
}
@@ -229,4 +233,4 @@
outputFiles.add(tempFile);
return tempFile;
}
-}
\ No newline at end of file
+}
--
To view, visit https://asterix-gerrit.ics.uci.edu/524
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib519882b9cbca941addcd66232c176a2eaeecc4b
Gerrit-PatchSet: 3
Gerrit-Project: hyracks
Gerrit-Branch: master
Gerrit-Owner: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: Yingyi Bu <bu...@gmail.com>
Change in hyracks[master]: Fix for ASTERIXDB-1200
Posted by "Till Westmann (Code Review)" <do...@asterixdb.incubator.apache.org>.
Till Westmann has posted comments on this change.
Change subject: Fix for ASTERIXDB-1200
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://asterix-gerrit.ics.uci.edu/524
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ib519882b9cbca941addcd66232c176a2eaeecc4b
Gerrit-PatchSet: 1
Gerrit-Project: hyracks
Gerrit-Branch: master
Gerrit-Owner: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: Yingyi Bu <bu...@gmail.com>
Gerrit-HasComments: No
Change in hyracks[master]: Fix for ASTERIXDB-1200
Posted by "Ian Maxon (Code Review)" <do...@asterixdb.incubator.apache.org>.
Hello Till Westmann, Jenkins,
I'd like you to reexamine a change. Please visit
https://asterix-gerrit.ics.uci.edu/524
to look at the new patch set (#2).
Change subject: Fix for ASTERIXDB-1200
......................................................................
Fix for ASTERIXDB-1200
Fixes an issue where in the Hyracks integration tests,
if the result size is 0, a NPE is thrown instead of
an assert passing or failing.
Change-Id: Ib519882b9cbca941addcd66232c176a2eaeecc4b
---
M hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/AbstractIntegrationTest.java
1 file changed, 7 insertions(+), 3 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/hyracks refs/changes/24/524/2
--
To view, visit https://asterix-gerrit.ics.uci.edu/524
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ib519882b9cbca941addcd66232c176a2eaeecc4b
Gerrit-PatchSet: 2
Gerrit-Project: hyracks
Gerrit-Branch: master
Gerrit-Owner: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: Yingyi Bu <bu...@gmail.com>
Change in hyracks[master]: Fix for ASTERIXDB-1200
Posted by "Till Westmann (Code Review)" <do...@asterixdb.incubator.apache.org>.
Till Westmann has posted comments on this change.
Change subject: Fix for ASTERIXDB-1200
......................................................................
Patch Set 2: Code-Review+2
--
To view, visit https://asterix-gerrit.ics.uci.edu/524
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ib519882b9cbca941addcd66232c176a2eaeecc4b
Gerrit-PatchSet: 2
Gerrit-Project: hyracks
Gerrit-Branch: master
Gerrit-Owner: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: Yingyi Bu <bu...@gmail.com>
Gerrit-HasComments: No