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 th...@apache.org on 2018/04/26 14:09:51 UTC
svn commit: r1830228 - in /jackrabbit/oak/branches/1.6: ./ oak-core/
oak-core/src/main/java/org/apache/jackrabbit/oak/query/fulltext/
oak-core/src/test/java/org/apache/jackrabbit/oak/query/fulltext/ oak-jcr/
oak-jcr/src/test/java/org/apache/jackrabbit/...
Author: thomasm
Date: Thu Apr 26 14:09:51 2018
New Revision: 1830228
URL: http://svn.apache.org/viewvc?rev=1830228&view=rev
Log:
OAK-7437 SimpleExcerptProvider highlighting should be case insensitive
Modified:
jackrabbit/oak/branches/1.6/ (props changed)
jackrabbit/oak/branches/1.6/oak-core/ (props changed)
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/query/fulltext/SimpleExcerptProvider.java
jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/query/fulltext/SimpleExcerptProviderTest.java
jackrabbit/oak/branches/1.6/oak-jcr/ (props changed)
jackrabbit/oak/branches/1.6/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryFulltextTest.java
Propchange: jackrabbit/oak/branches/1.6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 26 14:09:51 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,1804437,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,1827472,1827486,1827977,1829987,1830019
+/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,1804437,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,1827472,1827486,1827977,1829987,1830019,1830160
/jackrabbit/trunk:1345480
Propchange: jackrabbit/oak/branches/1.6/oak-core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 26 14:09:51 2018
@@ -1,5 +1,5 @@
/jackrabbit/oak/branches/1.0/oak-core:1665962
/jackrabbit/oak/trunk/oak-blob-plugins:1819950
-/jackrabbit/oak/trunk/oak-core: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,1789441,1789534,1790382,1792049,1792463,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,1799861,1799924,1800269,1800606,1800613,1800974,1801011,1801013,1801118-1801119,1801675,1802260,1802262,1802286,1802548,1802934,1802938,1802973,1803026,1803247-1803249,1803951,180395
3-1803955,1804437,1805851-1805852,1806668,1807308,1807688,1808125,1808128,1808142,1808240,1808246,1809024,1809026,1809131,1809163,1809253,1809255-1809256,1811380,1811952,1811963,1811986,1814332,1818645,1821325,1821358,1821516
+/jackrabbit/oak/trunk/oak-core: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,1789441,1789534,1790382,1792049,1792463,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,1799861,1799924,1800269,1800606,1800613,1800974,1801011,1801013,1801118-1801119,1801675,1802260,1802262,1802286,1802548,1802934,1802938,1802973,1803026,1803247-1803249,1803951,180395
3-1803955,1804437,1805851-1805852,1806668,1807308,1807688,1808125,1808128,1808142,1808240,1808246,1809024,1809026,1809131,1809163,1809253,1809255-1809256,1811380,1811952,1811963,1811986,1814332,1818645,1821325,1821358,1821516,1830160
/jackrabbit/oak/trunk/oak-store-document:1809866,1811575,1811702,1811709,1811823,1811835,1811931,1812739,1812750,1812753,1814407,1814499,1814579,1815450,1815466,1815940,1816436,1817379,1818301,1818303,1818903,1818906,1819421,1820199,1820661,1821130,1821477,1821487,1823163,1823169,1824962,1825442,1825470
/jackrabbit/trunk/oak-core:1345480
Modified: jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/query/fulltext/SimpleExcerptProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/query/fulltext/SimpleExcerptProvider.java?rev=1830228&r1=1830227&r2=1830228&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/query/fulltext/SimpleExcerptProvider.java (original)
+++ jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/query/fulltext/SimpleExcerptProvider.java Thu Apr 26 14:09:51 2018
@@ -19,6 +19,8 @@ package org.apache.jackrabbit.oak.query.
import java.util.BitSet;
import java.util.HashSet;
import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import com.google.common.base.Splitter;
import com.google.common.collect.ImmutableSet;
@@ -47,6 +49,8 @@ public class SimpleExcerptProvider {
public static final String REP_EXCERPT_FN = "rep:excerpt(.)";
public static final String EXCERPT_END = "</span></div>";
public static final String EXCERPT_BEGIN = "<div><span>";
+
+ private static final boolean CASE_SENSITIVE_HIGHLIGHT = Boolean.getBoolean("oak.query.caseSensitiveHighlight");
private static int maxFragmentSize = 150;
@@ -233,7 +237,7 @@ public class SimpleExcerptProvider {
}
int index = 0;
while (index < text.length()) {
- index = text.indexOf(token, index);
+ index = indexOfSearchText(text, token, index);
if (index < 0) {
break;
}
@@ -266,6 +270,26 @@ public class SimpleExcerptProvider {
}
}
}
+
+ private static int indexOfSearchText(String text, String searchStr, int fromIndex) {
+ if (CASE_SENSITIVE_HIGHLIGHT) {
+ return text.indexOf(searchStr, fromIndex);
+ }
+ return indexOfIgnoreCase(text, searchStr, fromIndex);
+ }
+
+ public static int indexOfIgnoreCase(String str, String searchStr, int startPos) {
+ // This is not very efficient, specially as we create the pattern each time.
+ // An alternative is to use apache commons lang StringUtils.indexOfIgnoreCase,
+ // but that would require a new dependency
+ String quotedSearchStr = Pattern.quote(searchStr);
+ Pattern pattern = Pattern.compile(quotedSearchStr, Pattern.CASE_INSENSITIVE);
+ Matcher matcher = pattern.matcher(str);
+ if(matcher.find(startPos)) {
+ return matcher.start();
+ }
+ return -1;
+ }
static boolean isDelimeter(int codePoint) {
return !isLetterOrDigit(codePoint);
Modified: jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/query/fulltext/SimpleExcerptProviderTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/query/fulltext/SimpleExcerptProviderTest.java?rev=1830228&r1=1830227&r2=1830228&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/query/fulltext/SimpleExcerptProviderTest.java (original)
+++ jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/query/fulltext/SimpleExcerptProviderTest.java Thu Apr 26 14:09:51 2018
@@ -32,6 +32,18 @@ import org.junit.Test;
public class SimpleExcerptProviderTest {
@Test
+ public void caseInsensitiveTest() throws Exception {
+ // This will make the test fail:
+ // static {
+ // System.setProperty("oak.query.caseSensitiveHighlight", "true");
+ // }
+ assertEquals("<div><span><strong>fox</strong> is jumping and dancing foxtrot</span></div>",
+ highlight(sb("fox is jumping and dancing foxtrot"), of("Fox")));
+ assertEquals("<div><span>fox is <strong>jumping</strong></span></div>",
+ highlight(sb("fox is jumping"), of("jUmP*")));
+ }
+
+ @Test
public void simpleTest() throws Exception {
assertEquals("<div><span><strong>fox</strong> is jumping</span></div>",
highlight(sb("fox is jumping"), of("fox")));
Propchange: jackrabbit/oak/branches/1.6/oak-jcr/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Apr 26 14:09:51 2018
@@ -0,0 +1,3 @@
+/jackrabbit/oak/branches/1.0/oak-jcr:1665962
+/jackrabbit/oak/trunk/oak-jcr: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,1804437,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,1827472,1827486,1827977,1829987,1830019,1830160,1830170
+/jackrabbit/trunk/oak-jcr:1345480
Modified: jackrabbit/oak/branches/1.6/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryFulltextTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryFulltextTest.java?rev=1830228&r1=1830227&r2=1830228&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryFulltextTest.java (original)
+++ jackrabbit/oak/branches/1.6/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryFulltextTest.java Thu Apr 26 14:09:51 2018
@@ -42,7 +42,7 @@ public class QueryFulltextTest extends A
public QueryFulltextTest(NodeStoreFixture fixture) {
super(fixture);
}
-
+
@Test
public void excerpt() throws Exception {
Session session = getAdminSession();
@@ -60,9 +60,9 @@ public class QueryFulltextTest extends A
RowIterator it;
Row row;
String s;
-
+
String xpath = "//*[jcr:contains(., 'hello')]/rep:excerpt(.) order by @jcr:path";
-
+
q = qm.createQuery(xpath, "xpath");
it = q.execute().getRows();
row = it.nextRow();
@@ -73,10 +73,9 @@ public class QueryFulltextTest extends A
row = it.nextRow();
path = row.getPath();
s = row.getValue("rep:excerpt(.)").getString();
- // TODO is this expected?
- assertTrue(path + ":" + s + " (3)", s.indexOf("Hello World") >= 0);
+ assertTrue(path + ":" + s + " (3)", s.indexOf("<strong>Hello</strong> World") >= 0);
assertTrue(path + ":" + s + " (4)", s.indexOf("Description") >= 0);
-
+
xpath = "//*[jcr:contains(., 'hello')]/rep:excerpt(.) order by @jcr:path";
q = qm.createQuery(xpath, "xpath");
@@ -89,11 +88,10 @@ public class QueryFulltextTest extends A
row = it.nextRow();
path = row.getPath();
s = row.getValue("rep:excerpt(text)").getString();
- // TODO is this expected?
- assertTrue(path + ":" + s + " (7)", s.indexOf("Hello World") >= 0);
+ assertTrue(path + ":" + s + " (7)", s.indexOf("<strong>Hello</strong> World") >= 0);
assertTrue(path + ":" + s + " (8)", s.indexOf("Description") < 0);
}
-
+
@Test
public void fulltextOrWithinText() throws Exception {
Session session = getAdminSession();
@@ -106,18 +104,18 @@ public class QueryFulltextTest extends A
Node n3 = testRootNode.addNode("node3");
n3.setProperty("text", "hello hallo");
session.save();
-
- String sql2 = "select [jcr:path] as [path] from [nt:base] " +
+
+ String sql2 = "select [jcr:path] as [path] from [nt:base] " +
"where contains([text], 'hello OR hallo') order by [jcr:path]";
-
+
Query q;
-
+
q = qm.createQuery("explain " + sql2, Query.JCR_SQL2);
- assertEquals("[nt:base] as [nt:base] /* traverse \"*\" " +
+ assertEquals("[nt:base] as [nt:base] /* traverse \"*\" " +
"where contains([nt:base].[text], 'hello OR hallo') */",
getResult(q.execute(), "plan"));
-
+
// verify the result
// uppercase "OR" mean logical "or"
q = qm.createQuery(sql2, Query.JCR_SQL2);
@@ -125,14 +123,14 @@ public class QueryFulltextTest extends A
getResult(q.execute(), "path"));
// lowercase "or" mean search for the term "or"
- sql2 = "select [jcr:path] as [path] from [nt:base] " +
+ sql2 = "select [jcr:path] as [path] from [nt:base] " +
"where contains([text], 'hello or hallo') order by [jcr:path]";
q = qm.createQuery(sql2, Query.JCR_SQL2);
- assertEquals("",
+ assertEquals("",
getResult(q.execute(), "path"));
}
-
+
static String getResult(QueryResult result, String propertyName) throws RepositoryException {
StringBuilder buff = new StringBuilder();
RowIterator it = result.getRows();
@@ -144,5 +142,5 @@ public class QueryFulltextTest extends A
}
return buff.toString();
}
-
+
}