Return-Path: X-Original-To: apmail-asterixdb-commits-archive@minotaur.apache.org Delivered-To: apmail-asterixdb-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 A9B7D185E1 for ; Sun, 13 Mar 2016 05:35:33 +0000 (UTC) Received: (qmail 10276 invoked by uid 500); 13 Mar 2016 05:35:33 -0000 Delivered-To: apmail-asterixdb-commits-archive@asterixdb.apache.org Received: (qmail 10240 invoked by uid 500); 13 Mar 2016 05:35:33 -0000 Mailing-List: contact commits-help@asterixdb.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@asterixdb.incubator.apache.org Delivered-To: mailing list commits@asterixdb.incubator.apache.org Received: (qmail 10231 invoked by uid 99); 13 Mar 2016 05:35:33 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 13 Mar 2016 05:35:33 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 0BE281803F7 for ; Sun, 13 Mar 2016 05:35:33 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.549 X-Spam-Level: X-Spam-Status: No, score=-3.549 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.329] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id yOxyJK3c3YdQ for ; Sun, 13 Mar 2016 05:35:30 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with SMTP id 3449B5F5CC for ; Sun, 13 Mar 2016 05:35:30 +0000 (UTC) Received: (qmail 10220 invoked by uid 99); 13 Mar 2016 05:35:29 -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; Sun, 13 Mar 2016 05:35:29 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 523DDDF9F5; Sun, 13 Mar 2016 05:35:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: amoudi@apache.org To: commits@asterixdb.incubator.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: incubator-asterixdb git commit: Flush Socket Feed Before Waiting for More Data Date: Sun, 13 Mar 2016 05:35:29 +0000 (UTC) Repository: incubator-asterixdb Updated Branches: refs/heads/master c90d3401c -> 472d2f50b Flush Socket Feed Before Waiting for More Data Change-Id: Ic37085114592e97b6c5b2d29c5451d816a154aa8 Reviewed-on: https://asterix-gerrit.ics.uci.edu/709 Tested-by: Jenkins Reviewed-by: Murtadha Hubail Project: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/commit/472d2f50 Tree: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/tree/472d2f50 Diff: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/diff/472d2f50 Branch: refs/heads/master Commit: 472d2f50bceb6d041645c62d726fc4a419dc85a0 Parents: c90d340 Author: Abdullah Alamoudi Authored: Fri Mar 11 19:26:22 2016 +0300 Committer: abdullah alamoudi Committed: Sat Mar 12 21:29:57 2016 -0800 ---------------------------------------------------------------------- .../apache/asterix/external/input/stream/SocketInputStream.java | 5 +++++ 1 file changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/472d2f50/asterix-external-data/src/main/java/org/apache/asterix/external/input/stream/SocketInputStream.java ---------------------------------------------------------------------- diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/input/stream/SocketInputStream.java b/asterix-external-data/src/main/java/org/apache/asterix/external/input/stream/SocketInputStream.java index cf8d339..67c4493 100644 --- a/asterix-external-data/src/main/java/org/apache/asterix/external/input/stream/SocketInputStream.java +++ b/asterix-external-data/src/main/java/org/apache/asterix/external/input/stream/SocketInputStream.java @@ -33,6 +33,7 @@ public class SocketInputStream extends AInputStream { private ServerSocket server; private Socket socket; private InputStream connectionStream; + private AbstractFeedDataFlowController controller; public SocketInputStream(ServerSocket server) throws IOException { this.server = server; @@ -73,6 +74,9 @@ public class SocketInputStream extends AInputStream { } int read = -1; try { + if (connectionStream.available() < 1) { + controller.flush(); + } read = connectionStream.read(b, off, len); } catch (IOException e) { e.printStackTrace(); @@ -166,5 +170,6 @@ public class SocketInputStream extends AInputStream { @Override public void setController(AbstractFeedDataFlowController controller) { + this.controller = controller; } }