Merge branch 'APEX-273' of https://github.com/vrozov/incubator-apex-core into devel-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/c3369486 Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/c3369486 Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/c3369486 Branch: refs/heads/master Commit: c3369486607a74299c4340bcd84b89c6b147e354 Parents: 38a6f4e 799df6c Author: Thomas Weise <[email protected]> Authored: Tue Dec 1 20:42:45 2015 -0800 Committer: Thomas Weise <[email protected]> Committed: Tue Dec 1 20:42:45 2015 -0800 ---------------------------------------------------------------------- bufferserver/pom.xml | 3 +- .../bufferserver/auth/AuthManager.java | 2 +- .../bufferserver/client/AuthClient.java | 6 +- .../bufferserver/client/Controller.java | 1 - .../bufferserver/client/Subscriber.java | 15 +--- .../bufferserver/internal/DataList.java | 90 ++++++++++++-------- .../bufferserver/internal/DataListener.java | 10 +-- .../bufferserver/internal/FastDataList.java | 12 +-- .../bufferserver/internal/LogicalNode.java | 29 ++++--- .../bufferserver/internal/PhysicalNode.java | 3 +- .../bufferserver/packet/DataTuple.java | 8 +- .../bufferserver/packet/EmptyTuple.java | 10 +-- .../packet/GenericRequestTuple.java | 20 ++--- .../bufferserver/packet/MessageType.java | 17 +++- .../bufferserver/packet/PayloadTuple.java | 6 +- .../packet/PublishRequestTuple.java | 5 +- .../bufferserver/packet/RequestTuple.java | 6 +- .../bufferserver/packet/ResetRequestTuple.java | 5 +- .../bufferserver/packet/ResetWindowTuple.java | 6 +- .../packet/SubscribeRequestTuple.java | 59 +++++-------- .../datatorrent/bufferserver/packet/Tuple.java | 15 ++-- .../bufferserver/packet/WindowIdTuple.java | 8 +- .../bufferserver/policy/AbstractPolicy.java | 12 +-- .../bufferserver/policy/GiveAll.java | 2 +- .../bufferserver/policy/LeastBusy.java | 14 +-- .../datatorrent/bufferserver/policy/Policy.java | 10 +-- .../bufferserver/policy/RandomOne.java | 12 +-- .../bufferserver/policy/RoundRobin.java | 18 ++-- .../datatorrent/bufferserver/server/Server.java | 44 ++++++---- .../bufferserver/storage/DiskStorage.java | 73 ++++++---------- .../bufferserver/util/SerializedData.java | 4 +- .../datatorrent/bufferserver/util/System.java | 12 ++- .../datatorrent/bufferserver/util/VarInt.java | 9 +- .../bufferserver/client/SubscriberTest.java | 39 ++++----- .../bufferserver/packet/NoMessageTupleTest.java | 23 +---- .../packet/PublishRequestTupleTest.java | 10 +-- .../packet/ResetWindowTupleTest.java | 10 +-- .../packet/SubscribeRequestTupleTest.java | 20 +++-- .../bufferserver/server/ServerTest.java | 67 ++++++++------- .../bufferserver/storage/DiskStorageTest.java | 11 +-- .../bufferserver/support/Subscriber.java | 9 +- .../bufferserver/util/CodecTest.java | 4 +- 42 files changed, 346 insertions(+), 393 deletions(-) ----------------------------------------------------------------------
