Allow TagVNotLiteralOrFilter to filter single char tag values

Signed-off-by: Chris Larsen <clarsen@yahoo-inc.com>
OpenTSDB · May 19, 2018 · 0c307b0 · 0c307b0
1 parent 05631e8
commit 0c307b0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/query/filter/TagVNotLiteralOrFilter.java b/src/query/filter/TagVNotLiteralOrFilter.java
@@ -60,9 +60,12 @@ public TagVNotLiteralOrFilter(final String tagk, final String filter,
     this.case_insensitive = case_insensitive;
 
     // we have to have at least one character.
-    if (filter == null || filter.length() < 2) {
+    if (filter == null || filter.isEmpty()) {
       throw new IllegalArgumentException("Filter cannot be null or empty");
     }
+    if (filter.length() == 1 && filter.charAt(0) == '|') {
+      throw new IllegalArgumentException("Filter must contain more than just a pipe");
+    }
     final String[] split = filter.split("\\|");
     if (case_insensitive) {
       for (int i = 0; i < split.length; i++) {

diff --git a/test/query/filter/TestTagVNotLiteralOrFilter.java b/test/query/filter/TestTagVNotLiteralOrFilter.java
@@ -122,6 +122,13 @@ public void matchSingleCaseInsensitive() throws Exception {
     assertFalse(filter.match(tags).join());
     assertTrue(((TagVNotLiteralOrFilter)filter).isCaseInsensitive());
   }
+
+  @Test
+  public void matchSingleCharacterTagValue() throws Exception {
+    TagVFilter filter = new TagVNotLiteralOrFilter(TAGK, "c");
+    tags.put(TAGK, "c");
+    assertFalse(filter.match(tags).join());
+  }
 
   @Test (expected = IllegalArgumentException.class)
   public void ctorNullTagk() throws Exception {