returning continuationOffset

projekt-opal · Jan 17, 2019 · 23fedea · 23fedea
1 parent 4335e4f
commit 23fedea
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/main/java/org/dice_research/opal/civet/Orchestration.java b/src/main/java/org/dice_research/opal/civet/Orchestration.java
@@ -75,8 +75,10 @@ public Map<String, Float> compute(URI dataset, Collection<String> metricIds) {
 	 *                  process all results.
 	 * @param limit     Number of items per request
 	 * @param metricIds a collection of metrics to compute
+	 * 
+	 * @return Offset for continuation
 	 */
-	public void compute(int offset, int endOffset, int limit, Collection<String> metricIds) {
+	public int compute(int offset, int endOffset, int limit, Collection<String> metricIds) {
 
 		// Get required data object IDs
 		Set<String> dataObjectIds = getDataobjectIds(metricIds);
@@ -117,6 +119,8 @@ public void compute(int offset, int endOffset, int limit, Collection<String> met
 				loopOffset = newLoopOffset;
 			}
 		}
+
+		return loopOffset;
 	}
 
 	/**

diff --git a/src/test/java/org/dice_research/opal/civet/access/OrchestrationTest.java b/src/test/java/org/dice_research/opal/civet/access/OrchestrationTest.java
@@ -71,8 +71,8 @@ public void testMultipleDatasets() {
 		int offset = 0;
 		int endOffset = 100;
 		int limit = 40;
-		int processedDatasets = orchestration.compute(offset, endOffset, limit, metrics);
-		assumeTrue(endOffset < processedDatasets);
+		int continuationOffset = orchestration.compute(offset, endOffset, limit, metrics);
+		assumeTrue(endOffset < continuationOffset);
 	}
 
 	/**