You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apex.apache.org by vr...@apache.org on 2016/10/10 15:32:39 UTC
[1/2] apex-core git commit: APEXCORE-476 toString() method was
returning wrong window ids, fixing this,
as the correct information is useful during debugging
Repository: apex-core
Updated Branches:
refs/heads/master a9a90e085 -> edad2a848
APEXCORE-476 toString() method was returning wrong window ids, fixing this, as the correct information is useful during debugging
Project: http://git-wip-us.apache.org/repos/asf/apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/apex-core/commit/4a4aebb7
Tree: http://git-wip-us.apache.org/repos/asf/apex-core/tree/4a4aebb7
Diff: http://git-wip-us.apache.org/repos/asf/apex-core/diff/4a4aebb7
Branch: refs/heads/master
Commit: 4a4aebb7c469fd09f6ad569dee124aabaf9b51e4
Parents: 0bdf771
Author: Sandesh Hegde <sa...@gmail.com>
Authored: Wed Oct 5 08:00:48 2016 -0700
Committer: Sandesh Hegde <sa...@gmail.com>
Committed: Wed Oct 5 08:00:48 2016 -0700
----------------------------------------------------------------------
.../com/datatorrent/bufferserver/packet/GenericRequestTuple.java | 2 +-
.../com/datatorrent/bufferserver/packet/SubscribeRequestTuple.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/apex-core/blob/4a4aebb7/bufferserver/src/main/java/com/datatorrent/bufferserver/packet/GenericRequestTuple.java
----------------------------------------------------------------------
diff --git a/bufferserver/src/main/java/com/datatorrent/bufferserver/packet/GenericRequestTuple.java b/bufferserver/src/main/java/com/datatorrent/bufferserver/packet/GenericRequestTuple.java
index ea49077..c94c6d5 100644
--- a/bufferserver/src/main/java/com/datatorrent/bufferserver/packet/GenericRequestTuple.java
+++ b/bufferserver/src/main/java/com/datatorrent/bufferserver/packet/GenericRequestTuple.java
@@ -160,7 +160,7 @@ public class GenericRequestTuple extends RequestTuple
public String toString()
{
return getClass().getSimpleName() + "{" + "version=" + version + ", identifier=" + identifier + ", windowId=" +
- Codec.getStringWindowId((long)baseSeconds | windowId) + '}';
+ Codec.getStringWindowId((long)baseSeconds << 32 | windowId) + '}';
}
private static final Logger logger = LoggerFactory.getLogger(GenericRequestTuple.class);
http://git-wip-us.apache.org/repos/asf/apex-core/blob/4a4aebb7/bufferserver/src/main/java/com/datatorrent/bufferserver/packet/SubscribeRequestTuple.java
----------------------------------------------------------------------
diff --git a/bufferserver/src/main/java/com/datatorrent/bufferserver/packet/SubscribeRequestTuple.java b/bufferserver/src/main/java/com/datatorrent/bufferserver/packet/SubscribeRequestTuple.java
index b63487b..e029015 100644
--- a/bufferserver/src/main/java/com/datatorrent/bufferserver/packet/SubscribeRequestTuple.java
+++ b/bufferserver/src/main/java/com/datatorrent/bufferserver/packet/SubscribeRequestTuple.java
@@ -286,7 +286,7 @@ public class SubscribeRequestTuple extends RequestTuple
public String toString()
{
return "SubscribeRequestTuple{" + "version=" + version + ", identifier=" + identifier +
- ", windowId=" + Codec.getStringWindowId((long)baseSeconds | windowId) + ", type=" + streamType +
+ ", windowId=" + Codec.getStringWindowId((long)baseSeconds << 32 | windowId) + ", type=" + streamType +
", upstreamIdentifier=" + upstreamIdentifier + ", mask=" + mask +
", partitions=" + (partitions == null ? "null" : Arrays.toString(partitions)) +
", bufferSize=" + bufferSize + '}';
[2/2] apex-core git commit: Merge branch 'APEXCORE-476' of
https://github.com/sandeshh/apex-core into APEXCORE-476
Posted by vr...@apache.org.
Merge branch 'APEXCORE-476' of https://github.com/sandeshh/apex-core into APEXCORE-476
Project: http://git-wip-us.apache.org/repos/asf/apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/apex-core/commit/edad2a84
Tree: http://git-wip-us.apache.org/repos/asf/apex-core/tree/edad2a84
Diff: http://git-wip-us.apache.org/repos/asf/apex-core/diff/edad2a84
Branch: refs/heads/master
Commit: edad2a8487cef47c050a63ee37a7d4a7dd99177c
Parents: a9a90e0 4a4aebb
Author: Vlad Rozov <v....@datatorrent.com>
Authored: Mon Oct 10 08:29:46 2016 -0700
Committer: Vlad Rozov <v....@datatorrent.com>
Committed: Mon Oct 10 08:29:46 2016 -0700
----------------------------------------------------------------------
.../com/datatorrent/bufferserver/packet/GenericRequestTuple.java | 2 +-
.../com/datatorrent/bufferserver/packet/SubscribeRequestTuple.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------