From 347372115dcb5ac7817b1b8d5c3ab4b47630b1b6 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Mon, 8 Oct 2018 13:57:59 +0200 Subject: No difference between empty and not set. --- .../java/com/yahoo/vespa/streamingvisitors/VdsVisitor.java | 3 +-- .../com/yahoo/vespa/streamingvisitors/VdsVisitorTestCase.java | 10 +++------- 2 files changed, 4 insertions(+), 9 deletions(-) (limited to 'container-search') diff --git a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsVisitor.java b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsVisitor.java index 889ea11b902..cfbea04a110 100644 --- a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsVisitor.java +++ b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsVisitor.java @@ -128,8 +128,7 @@ class VdsVisitor extends VisitorDataHandler implements Visitor { } private static String createSelectionString(String documentType, String selection) { - if (selection == null) return ""; - if (selection.isEmpty()) return documentType; + if ((selection == null) || selection.isEmpty()) return documentType; StringBuilder sb = new StringBuilder(documentType); sb.append(" and ( ").append(selection).append(" )"); diff --git a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsVisitorTestCase.java b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsVisitorTestCase.java index 4ffccccae10..f75b78fd36f 100644 --- a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsVisitorTestCase.java +++ b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsVisitorTestCase.java @@ -231,14 +231,10 @@ public class VdsVisitorTestCase { assertEquals(docType + " and ( id.user=="+qa.userId + " )", params.getDocumentSelection()); } else if (qa.groupName != null) { assertEquals(docType + " and ( id.group==\""+qa.groupName+"\" )", params.getDocumentSelection()); - } else if (qa.selection != null) { - if (qa.selection.isEmpty()) { - assertEquals(docType, params.getDocumentSelection()); - } else { - assertEquals(docType + " and ( " + qa.selection + " )", params.getDocumentSelection()); - } + } else if ((qa.selection == null) || qa.selection.isEmpty()) { + assertEquals(docType, params.getDocumentSelection()); } else { - assertEquals("", params.getDocumentSelection()); + assertEquals(docType + " and ( " + qa.selection + " )", params.getDocumentSelection()); } assertEquals(qa.headersOnly, params.getVisitHeadersOnly()); assertEquals(qa.from, params.getFromTimestamp()); -- cgit v1.2.3