Author: tommaso
Date: Thu Mar 22 14:11:25 2018
New Revision: 1827497
URL: http://svn.apache.org/viewvc?rev=1827497&view=rev
Log:
OAK-7375 - fixed JCR full text operators parsing, removed unused imports in
test (branch 1.6)
Modified:
jackrabbit/oak/branches/1.6/ (props changed)
jackrabbit/oak/branches/1.6/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/FilterQueryParser.java
jackrabbit/oak/branches/1.6/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultAnalyzersConfigurationTest.java
jackrabbit/oak/branches/1.6/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexIT.java
Propchange: jackrabbit/oak/branches/1.6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 22 14:11:25 2018
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782966,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783731,1783733,1783738,1783742,1783773,1783855,1783891,1784023,1784034,1784130,1784162,1784251,1784401,1784551,1784574,1784689,1785095,1785108,1785283,1785838,1785917,1785919,1785946,1786122,1787074,1787145,1787151,1787217,1787425,1788056,1788378,1788387-1788389,1788463,1788476,1788850,1789056,1789534,1790382,1790502-1790503,1792049,1792463,1792483,1792742,1792746,1793013,1793088,1793618,1793627,1793644,1794393,1794417,1794683,1795138,1795314,1795330,1795475,1795488,1795491,1795502,1795594,1795613,1795618,1796144,1796230,1796239,1796274,1796278,1796988,1797378,1798035,1798834,1799219,1799389,1799393,1799924,1800244,1800269,1800606,1800613,1800974,1801011,1801013,1801118-1801119,1801675,1802260,1802262,1802286,1802548,1802934,1802938,1802973,1803026,1803247-1803249,1803951
,1803953-1803955,1805851-1805852,1806668,1807308,1807688,1808022,1808125,1808128,1808142,1808240,1808246,1809024,1809026,1809131,1809163,1809253,1809255-1809256,1809289,1809745,1811071-1811072,1811155,1811380,1811655,1811952,1811963,1811986,1813192,1814189,1814332,1814397,1815201,1815426,1815438,1815926,1817326,1817919,1817987-1817988,1817990,1818038,1818042,1818056,1818124,1818554,1818576,1818645,1819048,1819050,1821325,1821358,1821495,1821516,1822850,1826237,1826338,1826532,1826640,1826932,1826957
+/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782966,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783731,1783733,1783738,1783742,1783773,1783855,1783891,1784023,1784034,1784130,1784162,1784251,1784401,1784551,1784574,1784689,1785095,1785108,1785283,1785838,1785917,1785919,1785946,1786122,1787074,1787145,1787151,1787217,1787425,1788056,1788378,1788387-1788389,1788463,1788476,1788850,1789056,1789534,1790382,1790502-1790503,1792049,1792463,1792483,1792742,1792746,1793013,1793088,1793618,1793627,1793644,1794393,1794417,1794683,1795138,1795314,1795330,1795475,1795488,1795491,1795502,1795594,1795613,1795618,1796144,1796230,1796239,1796274,1796278,1796988,1797378,1798035,1798834,1799219,1799389,1799393,1799924,1800244,1800269,1800606,1800613,1800974,1801011,1801013,1801118-1801119,1801675,1802260,1802262,1802286,1802548,1802934,1802938,1802973,1803026,1803247-1803249,1803951
,1803953-1803955,1805851-1805852,1806668,1807308,1807688,1808022,1808125,1808128,1808142,1808240,1808246,1809024,1809026,1809131,1809163,1809253,1809255-1809256,1809289,1809745,1811071-1811072,1811155,1811380,1811655,1811952,1811963,1811986,1813192,1814189,1814332,1814397,1815201,1815426,1815438,1815926,1817326,1817919,1817987-1817988,1817990,1818038,1818042,1818056,1818124,1818554,1818576,1818645,1819048,1819050,1821325,1821358,1821495,1821516,1822850,1826237,1826338,1826532,1826640,1826932,1826957,1827486
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.6/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.6/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/FilterQueryParser.java?rev=1827497&r1=1827496&r2=1827497&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.6/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/FilterQueryParser.java
(original)
+++
jackrabbit/oak/branches/1.6/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/FilterQueryParser.java
Thu Mar 22 14:11:25 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.6/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.6/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultAnalyzersConfigurationTest.java?rev=1827497&r1=1827496&r2=1827497&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.6/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultAnalyzersConfigurationTest.java
(original)
+++
jackrabbit/oak/branches/1.6/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultAnalyzersConfigurationTest.java
Thu Mar 22 14:11:25 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.6/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.6/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexIT.java?rev=1827497&r1=1827496&r2=1827497&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.6/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexIT.java
(original)
+++
jackrabbit/oak/branches/1.6/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexIT.java
Thu Mar 22 14:11:25 2018
@@ -408,6 +408,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");
