drill-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From abhipol <...@git.apache.org>
Subject [GitHub] drill pull request: DRILL-951:CSV header row should be parsed
Date Tue, 03 Nov 2015 07:21:19 GMT
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.
---

Mime
View raw message