Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id A402E200C2A for ; Wed, 15 Feb 2017 00:26:56 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id A28BE160B6A; Tue, 14 Feb 2017 23:26:56 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id EB3F7160B5F for ; Wed, 15 Feb 2017 00:26:55 +0100 (CET) Received: (qmail 36897 invoked by uid 500); 14 Feb 2017 23:26:55 -0000 Mailing-List: contact commits-help@carbondata.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@carbondata.incubator.apache.org Delivered-To: mailing list commits@carbondata.incubator.apache.org Received: (qmail 36888 invoked by uid 99); 14 Feb 2017 23:26:55 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Feb 2017 23:26:55 +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 8E3D6C5103 for ; Tue, 14 Feb 2017 23:26:54 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -6.218 X-Spam-Level: X-Spam-Status: No, score=-6.218 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=-2.999, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id a0qT-uZlck_T for ; Tue, 14 Feb 2017 23:26:52 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 4A07E5F47E for ; Tue, 14 Feb 2017 23:26:51 +0000 (UTC) Received: (qmail 36884 invoked by uid 99); 14 Feb 2017 23:26:50 -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; Tue, 14 Feb 2017 23:26:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 58BF6DFAB2; Tue, 14 Feb 2017 23:26:50 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jackylk@apache.org To: commits@carbondata.incubator.apache.org Date: Tue, 14 Feb 2017 23:26:52 -0000 Message-Id: <8959acd2c4b141e6b855395ddcebf4dd@git.apache.org> In-Reply-To: <1a95344434ac44508bf1f2347f4b26fc@git.apache.org> References: <1a95344434ac44508bf1f2347f4b26fc@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] incubator-carbondata git commit: [CARBONDATA-681] CSVReader related code improvement This closes #573 archived-at: Tue, 14 Feb 2017 23:26:56 -0000 [CARBONDATA-681] CSVReader related code improvement This closes #573 Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/f3496ee0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/f3496ee0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/f3496ee0 Branch: refs/heads/master Commit: f3496ee0bf5d98ed65210208d3e364e95b6c0962 Parents: 25de27f d6ceb1d Author: jackylk Authored: Tue Feb 14 15:26:40 2017 -0800 Committer: jackylk Committed: Tue Feb 14 15:26:40 2017 -0800 ---------------------------------------------------------------------- .../carbondata/hadoop/CarbonInputFormat.java | 6 +- .../carbondata/hadoop/csv/CSVInputFormat.java | 288 ----- .../recorditerator/RecordReaderIterator.java | 98 -- .../hadoop/io/BoundedInputStream.java | 129 --- .../hadoop/io/StringArrayWritable.java | 70 -- .../hadoop/readsupport/CarbonReadSupport.java | 15 +- .../AbstractDictionaryDecodedReadSupport.java | 84 -- .../impl/ArrayWritableReadSupport.java | 48 - .../impl/DictionaryDecodeReadSupport.java | 94 ++ .../impl/DictionaryDecodedReadSupportImpl.java | 34 - .../readsupport/impl/RawDataReadSupport.java | 17 +- .../hadoop/csv/CSVInputFormatTest.java | 169 --- hadoop/src/test/resources/data.csv.bz2 | Bin 10572 -> 0 bytes hadoop/src/test/resources/data.csv.gz | Bin 14710 -> 0 bytes hadoop/src/test/resources/data.csv.lz4 | Bin 24495 -> 0 bytes hadoop/src/test/resources/data.csv.snappy | Bin 24263 -> 0 bytes .../spark/rdd/NewCarbonDataLoadRDD.scala | 8 +- .../carbondata/spark/util/CommonUtil.scala | 2 +- .../spark/util/GlobalDictionaryUtil.scala | 4 +- .../readsupport/SparkRowReadSupportImpl.java | 4 +- .../readsupport/SparkRowReadSupportImpl.java | 4 +- .../processing/csvload/BoundedInputStream.java | 129 +++ .../processing/csvload/CSVInputFormat.java | 285 +++++ .../csvload/CSVRecordReaderIterator.java | 97 ++ .../processing/csvload/StringArrayWritable.java | 70 ++ .../processing/csvload/CSVInputFormatTest.java | 167 +++ processing/src/test/resources/csv/data.csv | 1001 ++++++++++++++++++ processing/src/test/resources/csv/data.csv.bz2 | Bin 0 -> 10572 bytes processing/src/test/resources/csv/data.csv.gz | Bin 0 -> 14710 bytes processing/src/test/resources/csv/data.csv.lz4 | Bin 0 -> 24495 bytes .../src/test/resources/csv/data.csv.snappy | Bin 0 -> 24263 bytes 31 files changed, 1870 insertions(+), 953 deletions(-) ----------------------------------------------------------------------