diff options
author | Jon Bratseth <bratseth@yahoo-inc.com> | 2016-08-15 10:04:15 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@yahoo-inc.com> | 2016-08-15 10:04:15 +0200 |
commit | 8eeb9f47fcd69c21fac12b4c2be1d39d43ee38f5 (patch) | |
tree | 6510f501df358b0dc5104a609c03dc0c485f84ed /container-search/src/main/java/com/yahoo/search | |
parent | dd8d510a7e38ada063b73056b78e9efa6ca56192 (diff) |
Whitespace changes only
Diffstat (limited to 'container-search/src/main/java/com/yahoo/search')
-rw-r--r-- | container-search/src/main/java/com/yahoo/search/yql/FieldFiller.java | 13 | ||||
-rw-r--r-- | container-search/src/main/java/com/yahoo/search/yql/YqlParser.java | 32 |
2 files changed, 17 insertions, 28 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/yql/FieldFiller.java b/container-search/src/main/java/com/yahoo/search/yql/FieldFiller.java index 653589a8e91..7ca6fcb71be 100644 --- a/container-search/src/main/java/com/yahoo/search/yql/FieldFiller.java +++ b/container-search/src/main/java/com/yahoo/search/yql/FieldFiller.java @@ -34,8 +34,7 @@ public class FieldFiller extends Searcher { private final Set<String> intersectionOfAttributes; private final SummaryIntersections summaryDb = new SummaryIntersections(); - public static final CompoundName FIELD_FILLER_DISABLE = new CompoundName( - "FieldFiller.disable"); + public static final CompoundName FIELD_FILLER_DISABLE = new CompoundName("FieldFiller.disable"); private static class SummaryIntersections { private final Map<String, Map<String, Set<String>>> db = new HashMap<>(); @@ -88,8 +87,7 @@ public class FieldFiller extends Searcher { intersection.retainAll(summary); } } - return intersection == null ? false : intersection - .containsAll(requested); + return intersection != null && intersection.containsAll(requested); } } @@ -131,8 +129,7 @@ public class FieldFiller extends Searcher { public void fill(Result result, String summaryClass, Execution execution) { execution.fill(result, summaryClass); - final Set<String> summaryFields = result.getQuery().getPresentation() - .getSummaryFields(); + Set<String> summaryFields = result.getQuery().getPresentation().getSummaryFields(); if (summaryFields.isEmpty() || summaryClass == null @@ -147,10 +144,10 @@ public class FieldFiller extends Searcher { } } else { // Yes, summaryClass may be Execution.ATTRIBUTEPREFETCH here - if (!summaryDb.hasAll(summaryFields, summaryClass, result - .getQuery().getModel().getRestrict())) { + if (!summaryDb.hasAll(summaryFields, summaryClass, result.getQuery().getModel().getRestrict())) { execution.fill(result, null); } } } + } diff --git a/container-search/src/main/java/com/yahoo/search/yql/YqlParser.java b/container-search/src/main/java/com/yahoo/search/yql/YqlParser.java index bcdc6ba060f..3be99fb3c29 100644 --- a/container-search/src/main/java/com/yahoo/search/yql/YqlParser.java +++ b/container-search/src/main/java/com/yahoo/search/yql/YqlParser.java @@ -271,11 +271,10 @@ public class YqlParser implements Parser { @NonNull private QueryTree buildTree(OperatorNode<?> filterPart) { Preconditions.checkArgument(filterPart.getArguments().length == 2, - "Expected 2 arguments to filter, got %s.", - filterPart.getArguments().length); + "Expected 2 arguments to filter, got %s.", + filterPart.getArguments().length); populateYqlSources(filterPart.<OperatorNode<?>> getArgument(0)); - final OperatorNode<ExpressionOperator> filterExpression = filterPart - .getArgument(1); + OperatorNode<ExpressionOperator> filterExpression = filterPart.getArgument(1); populateLinguisticsAnnotations(filterExpression); Item root = convertExpression(filterExpression); connectItems(); @@ -776,46 +775,39 @@ public class YqlParser implements Parser { } } - private void propagateUserInputAnnotations( - OperatorNode<ExpressionOperator> ast, Item item) { + private void propagateUserInputAnnotations(OperatorNode<ExpressionOperator> ast, Item item) { ToolBox.visit(new AnnotationPropagator(ast), item); - } @NonNull private Item parseUserInput(String grammar, String defaultIndex, String wordData, - Language language, boolean allowNullItem) { - Item item; + Language language, boolean allowNullItem) { Query.Type parseAs = Query.Type.getType(grammar); Parser parser = ParserFactory.newInstance(parseAs, environment); - // perhaps not use already resolved doctypes, but respect source and - // restrict - item = parser.parse( + // perhaps not use already resolved doctypes, but respect source and restrict + Item item = parser.parse( new Parsable().setQuery(wordData).addSources(docTypes) .setLanguage(language) .setDefaultIndexName(defaultIndex)).getRoot(); // the null check should be unnecessary, but is there to avoid having to // suppress null warnings - if (!allowNullItem && (item == null || item instanceof NullItem)) { - throw new IllegalArgumentException("Parsing \"" + wordData - + "\" only resulted in NullItem."); - } + if ( !allowNullItem && (item == null || item instanceof NullItem)) + throw new IllegalArgumentException("Parsing '" + wordData + "' only resulted in NullItem."); return item; } @NonNull private OperatorNode<?> fetchFilterPart() { - ProgramParser parser = new ProgramParser(); OperatorNode<?> ast; try { - ast = parser.parse("query", currentlyParsing.getQuery()); + ast = new ProgramParser().parse("query", currentlyParsing.getQuery()); } catch (Exception e) { throw new IllegalArgumentException(e); } assertHasOperator(ast, StatementOperator.PROGRAM); Preconditions.checkArgument(ast.getArguments().length == 1, - "Expected only a single argument to the root node, got %s.", - ast.getArguments().length); + "Expected only a single argument to the root node, got %s.", + ast.getArguments().length); // TODO: should we check size of first argument as well? ast = ast.<List<OperatorNode<?>>> getArgument(0).get(0); assertHasOperator(ast, StatementOperator.EXECUTE); |