Repository: drill Updated Branches: refs/heads/master 8f3dc0d10 -> 3e83b3462
DRILL-3441: fix indefinite loop problem in CompliantTextRecordReader#isStarQuery closes #82 Project: http://git-wip-us.apache.org/repos/asf/drill/repo Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/3e83b346 Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/3e83b346 Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/3e83b346 Branch: refs/heads/master Commit: 3e83b3462563f662c577ac1e56bf0ecd65fc5fe3 Parents: 8f3dc0d Author: Hanifi Gunes <[email protected]> Authored: Wed Jul 8 13:18:43 2015 -0700 Committer: Hanifi Gunes <[email protected]> Committed: Wed Jul 8 16:41:59 2015 -0700 ---------------------------------------------------------------------- .../store/easy/text/compliant/CompliantTextRecordReader.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/drill/blob/3e83b346/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/compliant/CompliantTextRecordReader.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/compliant/CompliantTextRecordReader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/compliant/CompliantTextRecordReader.java index 27b9116..ae11ba7 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/compliant/CompliantTextRecordReader.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/compliant/CompliantTextRecordReader.java @@ -70,16 +70,15 @@ public class CompliantTextRecordReader extends AbstractRecordReader { // checks to see if we are querying all columns(star) or individual columns @Override public boolean isStarQuery() { - if(settings.isUseRepeatedVarChar()){ + if(settings.isUseRepeatedVarChar()) { return super.isStarQuery() || Iterables.tryFind(getColumns(), new Predicate<SchemaPath>() { @Override public boolean apply(@Nullable SchemaPath path) { return path.equals(RepeatedVarCharOutput.COLUMNS); } }).isPresent(); - }else{ - return isStarQuery(); } + return super.isStarQuery(); } /**
