drill-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dsbos <...@git.apache.org>
Subject [GitHub] drill pull request: DRILL-2288: Fix ScanBatch violation of IterOut...
Date Mon, 02 Nov 2015 18:10:49 GMT
Github user dsbos commented on a diff in the pull request:

    https://github.com/apache/drill/pull/228#discussion_r43660011
  
    --- Diff: exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/JsonReader.java
---
    @@ -93,13 +93,15 @@ public void ensureAtLeastOneField(ComplexWriter writer) {
         if (!atLeastOneWrite) {
           // if we had no columns, create one empty one so we can return some data for count
purposes.
           SchemaPath sp = columns.get(0);
    -      PathSegment root = sp.getRootSegment();
    +      PathSegment fieldPath = sp.getRootSegment();
           BaseWriter.MapWriter fieldWriter = writer.rootAsMap();
    -      while (root.getChild() != null && !root.getChild().isArray()) {
    -        fieldWriter = fieldWriter.map(root.getNameSegment().getPath());
    -        root = root.getChild();
    +      while (fieldPath.getChild() != null && ! fieldPath.getChild().isArray())
{
    +        fieldWriter = fieldWriter.map(fieldPath.getNameSegment().getPath());
    +        fieldPath = fieldPath.getChild();
    +      }
    +      if (fieldWriter.isEmptyMap()) {
    --- End diff --
    
    That should be just a renaming:
    
    It looked like the variable originally named "root" related to the root (from getRootSegment())
only until it was modified in the loop (so the name was misleading from the beginning of the
loop and especially at the last reference).
    
    Renaming it with "field" was to reflect that it corresponds to variable "fieldWriter"
even as both are possibly modified in the loop.


---
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