svn commit: r1735059 - in /jackrabbit/oak/branches/1.4: ./ oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/ oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/

[catholicon]

Author: catholicon
Date: Tue Mar 15 11:40:19 2016
New Revision: 1735059

URL: http://svn.apache.org/viewvc?rev=1735059&view=rev
Log:
OAK-4126: Sugesstion and spellcheck queries throw exception if result contain 
lucene query character (backport 1735052 from trunk to 1.4)

Note, I have escaped acl check query for spellcheck too. But, I could not come 
up with a test case where words with special characters are returned for 
spellcheck (most probably it requires a custom analzer which doesn't break on 
special chars... but that seems too much effort to add a test for an obvious 
fix)

Modified:
    jackrabbit/oak/branches/1.4/   (props changed)
    
jackrabbit/oak/branches/1.4/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
    
jackrabbit/oak/branches/1.4/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexSuggestionTest.java

Propchange: jackrabbit/oak/branches/1.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 15 11:40:19 2016
@@ -1,3 +1,3 @@
 /jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1733615,1733875,1733913,1734230,1734254
+/jackrabbit/oak/trunk:1733615,1733875,1733913,1734230,1734254,1735052
 /jackrabbit/trunk:1345480

Modified: 
jackrabbit/oak/branches/1.4/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java?rev=1735059&r1=1735058&r2=1735059&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.4/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
 (original)
+++ 
jackrabbit/oak/branches/1.4/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
 Tue Mar 15 11:40:19 2016
@@ -454,7 +454,7 @@ public class LucenePropertyIndex impleme
                         // ACL filter spellchecks
                         QueryParser qp = new QueryParser(Version.LUCENE_47, 
aclCheckField, indexNode.getDefinition().getAnalyzer());
                         for (SuggestWord suggestion : suggestWords) {
-                            Query query = qp.createPhraseQuery(aclCheckField, 
suggestion.string);
+                            Query query = qp.createPhraseQuery(aclCheckField, 
qp.escape(suggestion.string));
 
                             query = addDescendantClauseIfRequired(query, plan);
 
@@ -482,7 +482,7 @@ public class LucenePropertyIndex impleme
 
                         // ACL filter suggestions
                         for (Lookup.LookupResult suggestion : lookupResults) {
-                            Query query = qp.parse("\"" + 
suggestion.key.toString() + "\"");
+                            Query query = qp.parse("\"" + 
qp.escape(suggestion.key.toString()) + "\"");
 
                             query = addDescendantClauseIfRequired(query, plan);
 

Modified: 
jackrabbit/oak/branches/1.4/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexSuggestionTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexSuggestionTest.java?rev=1735059&r1=1735058&r2=1735059&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.4/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexSuggestionTest.java
 (original)
+++ 
jackrabbit/oak/branches/1.4/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexSuggestionTest.java
 Tue Mar 15 11:40:19 2016
@@ -218,6 +218,21 @@ public class LuceneIndexSuggestionTest {
                 suggestQueryText, shouldSuggest, false);
     }
 
+    //OAK-4126
+    @Test
+    public void testSuggestQuerySpecialChars() throws Exception {
+        final String nodeType = "nt:unstructured";
+        final String indexPropName = "description";
+        final String indexPropValue = "DD~@#$%^&*()_+{}\":?><`1234567890-=[]";
+        final String suggestQueryText = "dd";
+        final boolean shouldSuggest = true;
+
+        checkSuggestions(nodeType,
+                indexPropName, indexPropValue,
+                false, false,
+                suggestQueryText, shouldSuggest, false);
+    }
+
     //OAK-3156
     @Test
     public void testSuggestQueryWithUserAccess() throws Exception {