You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by to...@apache.org on 2018/03/22 13:57:46 UTC
svn commit: r1827494 - in /jackrabbit/oak/branches/1.8: ./
oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/
oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/
oak-solr-core/src/test/ja...
Author: tommaso
Date: Thu Mar 22 13:57:46 2018
New Revision: 1827494
URL: http://svn.apache.org/viewvc?rev=1827494&view=rev
Log:
OAK-7375 - fixed JCR full text operators parsing, removed unused imports in test (branch 1.8)
Modified:
jackrabbit/oak/branches/1.8/ (props changed)
jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/FilterQueryParser.java
jackrabbit/oak/branches/1.8/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultAnalyzersConfigurationTest.java
jackrabbit/oak/branches/1.8/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexIT.java
Propchange: jackrabbit/oak/branches/1.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 22 13:57:46 2018
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821130,1821140-1821141,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821665,1821668,1821681,1822121,1822201,1822207,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1824196,1824198,1824962,1825362,1825381,1825442,1825448,1825466,1825470,1825475,1825523,1825525,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826237,1826338,1826516,1826532,1826640,1826932,1826957
+/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821130,1821140-1821141,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821665,1821668,1821681,1822121,1822201,1822207,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1824196,1824198,1824962,1825362,1825381,1825442,1825448,1825466,1825470,1825475,1825523,1825525,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826237,1826338,1826516,1826532,1826640,1826932,1826957,1827486
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/FilterQueryParser.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/FilterQueryParser.java?rev=1827494&r1=1827493&r2=1827494&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/FilterQueryParser.java (original)
+++ jackrabbit/oak/branches/1.8/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/FilterQueryParser.java Thu Mar 22 13:57:46 2018
@@ -290,10 +290,13 @@ class FilterQueryParser {
public boolean visit(FullTextOr or) {
fullTextString.append('(');
for (int i = 0; i < or.list.size(); i++) {
+ FullTextExpression e = or.list.get(i);
+ if (e.toString().equals("\"OR\"")) {
+ continue;
+ }
if (i > 0 && i < or.list.size()) {
fullTextString.append(" OR ");
}
- FullTextExpression e = or.list.get(i);
String orTerm = parseFullTextExpression(e, configuration);
fullTextString.append(orTerm);
}
@@ -311,10 +314,13 @@ class FilterQueryParser {
public boolean visit(FullTextAnd and) {
fullTextString.append('(');
for (int i = 0; i < and.list.size(); i++) {
+ FullTextExpression e = and.list.get(i);
+ if (e.toString().equals("\"AND\"")) {
+ continue;
+ }
if (i > 0 && i < and.list.size()) {
fullTextString.append(" AND ");
}
- FullTextExpression e = and.list.get(i);
String andTerm = parseFullTextExpression(e, configuration);
fullTextString.append(andTerm);
}
Modified: jackrabbit/oak/branches/1.8/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultAnalyzersConfigurationTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultAnalyzersConfigurationTest.java?rev=1827494&r1=1827493&r2=1827494&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultAnalyzersConfigurationTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultAnalyzersConfigurationTest.java Thu Mar 22 13:57:46 2018
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.plugins.index.solr.configuration;
-import java.io.Reader;
import java.io.StringReader;
import java.util.regex.Pattern;
@@ -30,7 +29,6 @@ import org.apache.lucene.analysis.path.P
import org.apache.lucene.analysis.pattern.PatternCaptureGroupTokenFilter;
import org.apache.lucene.analysis.pattern.PatternReplaceFilter;
import org.apache.lucene.analysis.reverse.ReverseStringFilter;
-import org.apache.lucene.util.Version;
import org.junit.Before;
import org.junit.Test;
Modified: jackrabbit/oak/branches/1.8/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexIT.java?rev=1827494&r1=1827493&r2=1827494&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexIT.java (original)
+++ jackrabbit/oak/branches/1.8/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexIT.java Thu Mar 22 13:57:46 2018
@@ -410,6 +410,30 @@ public class SolrIndexIT extends Abstrac
}
@Test
+ public void testFulltextOperators() throws Exception {
+ Tree test = root.getTree("/").addChild("test");
+ test.addChild("a").setProperty("text", "the lazy fox jumped over the brown dog");
+ test.addChild("b").setProperty("text", "the lazy bones raised to eat a dog");
+ root.commit();
+
+ assertQuery(
+ "/jcr:root//*[jcr:contains(., 'lazy AND brown')]",
+ "xpath", ImmutableList.of("/test/a"));
+
+ assertQuery(
+ "/jcr:root//*[jcr:contains(., 'lazy OR eat')]",
+ "xpath", ImmutableList.of("/test/a", "/test/b"));
+
+ assertQuery(
+ "/jcr:root//*[jcr:contains(., 'lazy AND bones')]",
+ "xpath", ImmutableList.of("/test/b"));
+
+ assertQuery(
+ "/jcr:root//*[jcr:contains(., 'lazy OR dog')]",
+ "xpath", ImmutableList.of("/test/a", "/test/b"));
+ }
+
+ @Test
public void containsPath() throws Exception {
Tree test = root.getTree("/").addChild("test");