Return-Path: X-Original-To: apmail-drill-dev-archive@www.apache.org Delivered-To: apmail-drill-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1C96817B22 for ; Tue, 3 Nov 2015 07:54:25 +0000 (UTC) Received: (qmail 85526 invoked by uid 500); 3 Nov 2015 07:24:21 -0000 Delivered-To: apmail-drill-dev-archive@drill.apache.org Received: (qmail 84974 invoked by uid 500); 3 Nov 2015 07:24:21 -0000 Mailing-List: contact dev-help@drill.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@drill.apache.org Delivered-To: mailing list dev@drill.apache.org Received: (qmail 83517 invoked by uid 99); 3 Nov 2015 07:21:19 -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, 03 Nov 2015 07:21:19 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1359EE03CE; Tue, 3 Nov 2015 07:21:19 +0000 (UTC) From: abhipol To: dev@drill.apache.org Reply-To: dev@drill.apache.org References: In-Reply-To: Subject: [GitHub] drill pull request: DRILL-951:CSV header row should be parsed Content-Type: text/plain Message-Id: <20151103072119.1359EE03CE@git1-us-west.apache.org> Date: Tue, 3 Nov 2015 07:21:19 +0000 (UTC) Github user abhipol commented on a diff in the pull request: https://github.com/apache/drill/pull/232#discussion_r43721297 --- Diff: exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/compliant/CompliantTextRecordReader.java --- @@ -101,16 +108,23 @@ public void setup(OperatorContext context, OutputMutator outputMutator) throws E InputStream stream = dfs.openPossiblyCompressedStream(split.getPath()); TextInput input = new TextInput(settings, stream, readBuffer, split.getStart(), split.getStart() + split.getLength()); - TextOutput output = null; if(settings.isUseRepeatedVarChar()){ - output = new RepeatedVarCharOutput(outputMutator, getColumns(), isStarQuery()); - }else{ - //TODO: Add field output. - throw new UnsupportedOperationException(); + TextOutput output = new RepeatedVarCharOutput(outputMutator, getColumns(), isStarQuery()); + this.reader = new TextReader(settings, input, output, whitespaceBuffer); + reader.start(); + } else { + // two-phase read approach. + // phase-1: read the header from the file + String [] fieldNames = extractHeader(input); + + // phase-2: now read the data + stream = dfs.openPossiblyCompressedStream(split.getPath()); + input = new TextInput(settings, stream, readBuffer, split.getStart(), split.getStart() + split.getLength()); + TextOutput output = new FieldVarCharOutput(outputMutator, fieldNames, getColumns(), isStarQuery()); + this.reader = new TextReader(settings, input, output, whitespaceBuffer); --- End diff -- the second output is using FieldVarCharOutput I made few cosmetic changes for better flow. will upload with other changes. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastructure@apache.org or file a JIRA ticket with INFRA. ---