From d55e2dfc24de2f0350e7f132cccaf1afc8c2fce8 Mon Sep 17 00:00:00 2001 From: Allan Clements Date: Fri, 1 Dec 2023 15:52:56 -0600 Subject: [PATCH] Removed special casing for Text.Contains doing pre-submission tokenizing --- .../java/org/janusgraph/diskstorage/solr/SolrIndex.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/janusgraph-solr/src/main/java/org/janusgraph/diskstorage/solr/SolrIndex.java b/janusgraph-solr/src/main/java/org/janusgraph/diskstorage/solr/SolrIndex.java index 34b45ce7c0e..371a897244e 100644 --- a/janusgraph-solr/src/main/java/org/janusgraph/diskstorage/solr/SolrIndex.java +++ b/janusgraph-solr/src/main/java/org/janusgraph/diskstorage/solr/SolrIndex.java @@ -857,10 +857,8 @@ public String buildQueryFilter(Condition condition, KeyInform throw new IllegalArgumentException("Text mapped string values only support CONTAINS and Compare queries and not: " + predicate); if (map==Mapping.STRING && Text.HAS_CONTAINS.contains(predicate)) throw new IllegalArgumentException("String mapped string values do not support CONTAINS queries: " + predicate); - //Special case - if (predicate == Text.CONTAINS) { - return tokenize(ParameterType.TEXT_ANALYZER, information, value, key, predicate); - } else if (predicate == Text.PREFIX || predicate == Text.CONTAINS_PREFIX + if (predicate == Text.CONTAINS + || predicate == Text.PREFIX|| predicate == Text.CONTAINS_PREFIX || predicate == Text.REGEX || predicate == Text.CONTAINS_REGEX || predicate == Text.FUZZY || predicate == Text.CONTAINS_FUZZY) { return buildQueryFilterStringValue(key, (String) value, predicate, information);