Return-Path: X-Original-To: apmail-apex-commits-archive@minotaur.apache.org Delivered-To: apmail-apex-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6F88B17507 for ; Wed, 2 Dec 2015 04:58:44 +0000 (UTC) Received: (qmail 76300 invoked by uid 500); 2 Dec 2015 04:58:39 -0000 Delivered-To: apmail-apex-commits-archive@apex.apache.org Received: (qmail 76260 invoked by uid 500); 2 Dec 2015 04:58:39 -0000 Mailing-List: contact commits-help@apex.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@apex.incubator.apache.org Delivered-To: mailing list commits@apex.incubator.apache.org Received: (qmail 76251 invoked by uid 99); 2 Dec 2015 04:58:39 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Dec 2015 04:58:39 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id C7821C059B for ; Wed, 2 Dec 2015 04:58:38 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.227 X-Spam-Level: * X-Spam-Status: No, score=1.227 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.554, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id sTNRzG0vs7cf for ; Wed, 2 Dec 2015 04:58:27 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id 70D5B21270 for ; Wed, 2 Dec 2015 04:58:26 +0000 (UTC) Received: (qmail 76114 invoked by uid 99); 2 Dec 2015 04:58:25 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Dec 2015 04:58:25 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2E62AE05D3; Wed, 2 Dec 2015 04:58:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: thw@apache.org To: commits@apex.incubator.apache.org Date: Wed, 02 Dec 2015 04:58:27 -0000 Message-Id: <087369d6acf2474aa4f3888edf1836c0@git.apache.org> In-Reply-To: <19a77e2fdd824d809abc8b22f97c57ea@git.apache.org> References: <19a77e2fdd824d809abc8b22f97c57ea@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] incubator-apex-core git commit: Merge branch 'APEX-273' of https://github.com/vrozov/incubator-apex-core into devel-3 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/devel-3 Commit: c3369486607a74299c4340bcd84b89c6b147e354 Parents: 38a6f4e 799df6c Author: Thomas Weise Authored: Tue Dec 1 20:42:45 2015 -0800 Committer: Thomas Weise 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(-) ----------------------------------------------------------------------