You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apex.apache.org by da...@apache.org on 2016/10/24 20:21:13 UTC
[1/2] apex-core git commit: APEXCORE-562: RecordingsAgent returns
records for offset beyond number of tuples
Repository: apex-core
Updated Branches:
refs/heads/master ce74fe78e -> 2c024cd84
APEXCORE-562: RecordingsAgent returns records for offset beyond number of tuples
Project: http://git-wip-us.apache.org/repos/asf/apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/apex-core/commit/fb91a589
Tree: http://git-wip-us.apache.org/repos/asf/apex-core/tree/fb91a589
Diff: http://git-wip-us.apache.org/repos/asf/apex-core/diff/fb91a589
Branch: refs/heads/master
Commit: fb91a589af1d89b73d4317f19523e78e731830b8
Parents: 81b8c92
Author: Priyanka Gugale <pr...@apache.org>
Authored: Wed Oct 19 18:02:55 2016 +0530
Committer: Priyanka Gugale <pr...@apache.org>
Committed: Wed Oct 19 18:02:55 2016 +0530
----------------------------------------------------------------------
.../main/java/com/datatorrent/stram/client/RecordingsAgent.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/apex-core/blob/fb91a589/engine/src/main/java/com/datatorrent/stram/client/RecordingsAgent.java
----------------------------------------------------------------------
diff --git a/engine/src/main/java/com/datatorrent/stram/client/RecordingsAgent.java b/engine/src/main/java/com/datatorrent/stram/client/RecordingsAgent.java
index aee5c59..22261ba 100644
--- a/engine/src/main/java/com/datatorrent/stram/client/RecordingsAgent.java
+++ b/engine/src/main/java/com/datatorrent/stram/client/RecordingsAgent.java
@@ -522,9 +522,10 @@ public final class RecordingsAgent extends FSPartFileAgent
lastProcessPartFile = indexLine.partFile;
try (BufferedReader partBr = new BufferedReader(new InputStreamReader(stramAgent.getFileSystem().open(new Path(dir, indexLine.partFile))))) {
processPartFile(partBr, queryType, low, high, limit, ports, numRemainingTuples, currentTimestamp, currentWindowLow, currentOffset, info);
+ currentOffset += numTuples;
}
}
- currentOffset += numTuples;
+
if (numRemainingTuples.longValue() <= 0 || (queryType == QueryType.TIME && currentTimestamp.longValue() > high)) {
return info;
}
[2/2] apex-core git commit: Merge commit 'refs/pull/412/head' of
github.com:apache/apex-core
Posted by da...@apache.org.
Merge commit 'refs/pull/412/head' of github.com:apache/apex-core
Project: http://git-wip-us.apache.org/repos/asf/apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/apex-core/commit/2c024cd8
Tree: http://git-wip-us.apache.org/repos/asf/apex-core/tree/2c024cd8
Diff: http://git-wip-us.apache.org/repos/asf/apex-core/diff/2c024cd8
Branch: refs/heads/master
Commit: 2c024cd84648d280611b179da9fbbbbec0ab8a6f
Parents: ce74fe7 fb91a58
Author: David Yan <da...@datatorrent.com>
Authored: Mon Oct 24 13:20:58 2016 -0700
Committer: David Yan <da...@datatorrent.com>
Committed: Mon Oct 24 13:20:58 2016 -0700
----------------------------------------------------------------------
.../main/java/com/datatorrent/stram/client/RecordingsAgent.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------