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 4AFF919D92 for ; Mon, 28 Mar 2016 05:59:42 +0000 (UTC) Received: (qmail 73024 invoked by uid 500); 28 Mar 2016 05:59:42 -0000 Delivered-To: apmail-asterixdb-commits-archive@asterixdb.apache.org Received: (qmail 72984 invoked by uid 500); 28 Mar 2016 05:59:42 -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 72975 invoked by uid 99); 28 Mar 2016 05:59:42 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 Mar 2016 05:59:42 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 7C68AC36B7 for ; Mon, 28 Mar 2016 05:59:41 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.216 X-Spam-Level: X-Spam-Status: No, score=-4.216 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.996] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id cFB6J-Ec9OeR for ; Mon, 28 Mar 2016 05:59:39 +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 1B0625F2C4 for ; Mon, 28 Mar 2016 05:59:38 +0000 (UTC) Received: (qmail 72972 invoked by uid 99); 28 Mar 2016 05:59:38 -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; Mon, 28 Mar 2016 05:59:38 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 38F92DFC8E; Mon, 28 Mar 2016 05:59:38 +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: Fix Asterix Stream Reader Date: Mon, 28 Mar 2016 05:59:38 +0000 (UTC) Repository: incubator-asterixdb Updated Branches: refs/heads/master 121e1d9ab -> b71a9d09b Fix Asterix Stream Reader The reset method in the asterix stream reader wasn't working. Calling clear() on a byte buffer only reset the position but not the limit. hence, the reader still thinks that there are some leftover data. This has been fixed to set the limit to 0 Change-Id: I41a84baacdd233120ca08eeebbd2d757b4e5c154 Reviewed-on: https://asterix-gerrit.ics.uci.edu/761 Reviewed-by: Yingyi Bu Tested-by: Jenkins Project: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/commit/b71a9d09 Tree: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/tree/b71a9d09 Diff: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/diff/b71a9d09 Branch: refs/heads/master Commit: b71a9d09b8f5117e6aa903a172d365d217b4357b Parents: 121e1d9 Author: Abdullah Alamoudi Authored: Mon Mar 28 08:40:09 2016 +0300 Committer: abdullah alamoudi Committed: Sun Mar 27 22:53:19 2016 -0700 ---------------------------------------------------------------------- .gitignore | 1 + .../asterix/external/input/stream/AsterixInputStreamReader.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/b71a9d09/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index 8d0e894..926dcfe 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,7 @@ asterix-app/rttest/ asterix-app/mdtest/ asterix-app/opttest/ asterix-app/parserts/ +asterix-app/library/ asterix-app/opt_parserts/ asterix-app/runtime_parserts/ asterix-app/data/csv/beer.csv http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/b71a9d09/asterix-external-data/src/main/java/org/apache/asterix/external/input/stream/AsterixInputStreamReader.java ---------------------------------------------------------------------- diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/input/stream/AsterixInputStreamReader.java b/asterix-external-data/src/main/java/org/apache/asterix/external/input/stream/AsterixInputStreamReader.java index b1ef892..7e280a5 100644 --- a/asterix-external-data/src/main/java/org/apache/asterix/external/input/stream/AsterixInputStreamReader.java +++ b/asterix-external-data/src/main/java/org/apache/asterix/external/input/stream/AsterixInputStreamReader.java @@ -115,6 +115,6 @@ public class AsterixInputStreamReader extends Reader { @Override public void reset() throws IOException { - byteBuffer.clear(); + byteBuffer.limit(0); } }