Author: catholicon
Date: Thu Apr 7 01:19:13 2016
New Revision: 1738066
URL: http://svn.apache.org/viewvc?rev=1738066&view=rev
Log:
OAK-3331 - support multiple words spellchecking in lucene (backport r1700720 to
1.2 branch)
OAK-3509 Lucene suggestion results should have 1 row per suggestion with
appropriate column names (backport r1715716 to 1.2 branch)
* Suggestions and spellcheck results returned per row with weight coming up as
jcr:score
* Adjusted test cases accordingly (no extra tests as multiple
suggestion/spellcheck were there)
Modified:
jackrabbit/oak/branches/1.2/ (props changed)
jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorContext.java
jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/SpellcheckTest.java
jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/SuggestTest.java
jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexSuggestionTest.java
jackrabbit/oak/branches/1.2/oak-lucene/src/test/resources/org/apache/jackrabbit/oak/query/sql1.txt
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 7 01:19:13 2016
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672611,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673713,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675319,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678023,1678095-1678096,1678124,1678171,1678173,1678202,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680170,1680172,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1681921,1681955,1682042,1682218,1682235,1682437,1682488,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174-1684175,1684186,1684376,1684442,1684561
,1684570,1684601,1684618,1684669,1684820,1684868,1684894,1685023,1685075,1685370,1685541,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686003,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686780,1686854,1686857,1686971,1687053-1687055,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688172,1688179,1688349,1688421,1688436,1688453,1688616,1688622,1688634,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690669,1690674,1690885,1690941,1691139,1691151,1691159,1691167,1691183,1691188,1691210,1691280,1691307,1691331-1691333,1691345,1691384-1691385,1691401,1691509,1692133-1692134,1692156,1692250,1692274,1692363,1692382,1692478,1692955,1693002,1693030,1693050,1693209,1693401,1693421,1693525-1693526,1694007,1694393-1694394,1694651,1694653-1694654,1695032,1695050,1695122,1695280,1695299,1695
420,1695457,1695482,1695492,1695507,1695521,1695540,1695571,1695905,1696190,1696194,1696242,1696285,1696375,1696522,1696578,1696759,1696916,1697363,1697373,1697410,1697582,1697589,1697616,1697672,1697896,1700191,1700231,1700397,1700403,1700506,1700571,1700718,1700727,1700749,1700769,1700775,1701065,1701619,1701733,1701743,1701750,1701768,1701806,1701810,1701814,1701907,1701948,1701955,1701959,1701965,1701986,1702014,1702022,1702045,1702051,1702241,1702272,1702371,1702387,1702405,1702423,1702426,1702428,1702860,1702866,1702942,1702960,1703212,1703382,1703395,1703411,1703428,1703430,1703568,1703592,1703758,1703858,1703878,1704256,1704282,1704285,1704457,1704479,1704490,1704614,1704629,1704636,1704655,1704670,1704886,1705005,1705027,1705043,1705055,1705250,1705268,1705273,1705323,1705677,1705701,1705871,1705992,1705998,1706009,1706037,1706059,1706212,1706218,1706270,1706764,1706772,1707049,1707189,1707191,1707331,1707435,1707509,1708049,1708105,1708307,1708315,1708546,1708592,1708766,1
709012,1709852,1709978,1710013,1710031,1710049,1710205,1710242,1710559,1710575,1710590,1710614,1710637,1710789,1710800,1710811,1710816,1710972,1711248,1711282,1711296,1711405,1711498,1711654,1712018,1712042,1712319,1712490,1712531,1712730,1712785,1712963,1713008,1713439,1713461,1713580,1713586,1713599-1713600,1713626,1713698,1713803,1713809,1714034,1714061,1714084,1714170,1714213,1714229,1714238,1714519-1714520,1714543-1714544,1714730,1714739,1714779,1714956,1714961,1715010,1715092,1715191,1715346,1715767,1715771,1715888,1715898,1716178,1716426,1716576,1716596,1716616,1716703,1716712,1716815,1716823,1716830,1716883,1717277,1717462,1717632,1717768-1717769,1717784,1717789,1717988,1718528,1718533,1718547-1718548,1718626,1718646,1718772,1718801-1718802,1718895,1719111,1719288,1719869,1720335,1720350,1720354,1720500,1721160,1721172,1721337,1722141,1722832,1723227,1723239,1723241,1723251,1723254,1723333,1723347,1723350,1723584,1723713,1723731,1724026,1724057,1724186,1724210,1724401,172462
8,1724631,1725216,1725477,1725515,1725555,1725960,1726232,1726570,1726579,1726585-1726586,1726621,1726795,1726797,1726809,1726812,1726981,1726993,1727026,1727254,1727331,1727350,1727358,1727429,1727476,1727508,1727515-1727518,1727893,1728037,1728041,1728070,1728114,1728281,1728443,1728642,1729200,1729979,1730216,1730527,1730581,1730629,1730801,1731647-1731648,1731797,1732131,1732278,1734254,1735484,1735588,1737334,1737349
+/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672611,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673713,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675319,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678023,1678095-1678096,1678124,1678171,1678173,1678202,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680170,1680172,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1681921,1681955,1682042,1682218,1682235,1682437,1682488,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174-1684175,1684186,1684376,1684442,1684561
,1684570,1684601,1684618,1684669,1684820,1684868,1684894,1685023,1685075,1685370,1685541,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686003,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686780,1686854,1686857,1686971,1687053-1687055,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688172,1688179,1688349,1688421,1688436,1688453,1688616,1688622,1688634,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690669,1690674,1690885,1690941,1691139,1691151,1691159,1691167,1691183,1691188,1691210,1691280,1691307,1691331-1691333,1691345,1691384-1691385,1691401,1691509,1692133-1692134,1692156,1692250,1692274,1692363,1692382,1692478,1692955,1693002,1693030,1693050,1693209,1693401,1693421,1693525-1693526,1694007,1694393-1694394,1694651,1694653-1694654,1695032,1695050,1695122,1695280,1695299,1695
420,1695457,1695482,1695492,1695507,1695521,1695540,1695571,1695905,1696190,1696194,1696242,1696285,1696375,1696522,1696578,1696759,1696916,1697363,1697373,1697410,1697582,1697589,1697616,1697672,1697896,1700191,1700231,1700397,1700403,1700506,1700571,1700718,1700720,1700727,1700749,1700769,1700775,1701065,1701619,1701733,1701743,1701750,1701768,1701806,1701810,1701814,1701907,1701948,1701955,1701959,1701965,1701986,1702014,1702022,1702045,1702051,1702241,1702272,1702371,1702387,1702405,1702423,1702426,1702428,1702860,1702866,1702942,1702960,1703212,1703382,1703395,1703411,1703428,1703430,1703568,1703592,1703758,1703858,1703878,1704256,1704282,1704285,1704457,1704479,1704490,1704614,1704629,1704636,1704655,1704670,1704886,1705005,1705027,1705043,1705055,1705250,1705268,1705273,1705323,1705677,1705701,1705871,1705992,1705998,1706009,1706037,1706059,1706212,1706218,1706270,1706764,1706772,1707049,1707189,1707191,1707331,1707435,1707509,1708049,1708105,1708307,1708315,1708546,1708592,1
708766,1709012,1709852,1709978,1710013,1710031,1710049,1710205,1710242,1710559,1710575,1710590,1710614,1710637,1710789,1710800,1710811,1710816,1710972,1711248,1711282,1711296,1711405,1711498,1711654,1712018,1712042,1712319,1712490,1712531,1712730,1712785,1712963,1713008,1713439,1713461,1713580,1713586,1713599-1713600,1713626,1713698,1713803,1713809,1714034,1714061,1714084,1714170,1714213,1714229,1714238,1714519-1714520,1714543-1714544,1714730,1714739,1714779,1714956,1714961,1715010,1715092,1715191,1715346,1715716,1715767,1715771,1715888,1715898,1716178,1716426,1716576,1716596,1716616,1716703,1716712,1716815,1716823,1716830,1716883,1717277,1717462,1717632,1717768-1717769,1717784,1717789,1717988,1718528,1718533,1718547-1718548,1718626,1718646,1718772,1718801-1718802,1718895,1719111,1719288,1719869,1720335,1720350,1720354,1720500,1721160,1721172,1721337,1722141,1722832,1723227,1723239,1723241,1723251,1723254,1723333,1723347,1723350,1723584,1723713,1723731,1724026,1724057,1724186,172421
0,1724401,1724628,1724631,1725216,1725477,1725515,1725555,1725960,1726232,1726570,1726579,1726585-1726586,1726621,1726795,1726797,1726809,1726812,1726981,1726993,1727026,1727254,1727331,1727350,1727358,1727429,1727476,1727508,1727515-1727518,1727893,1728037,1728041,1728070,1728114,1728281,1728443,1728642,1729200,1729979,1730216,1730527,1730581,1730629,1730801,1731647-1731648,1731797,1732131,1732278,1734254,1735484,1735588,1737334,1737349
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorContext.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorContext.java?rev=1738066&r1=1738065&r2=1738066&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorContext.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorContext.java
Thu Apr 7 01:19:13 2016
@@ -28,6 +28,8 @@ import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.util.Calendar;
+import java.util.HashMap;
+import java.util.Map;
import java.util.Set;
import java.util.concurrent.TimeUnit;
@@ -44,6 +46,9 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.util.PerfLogger;
import org.apache.jackrabbit.util.ISO8601;
+import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.analysis.miscellaneous.PerFieldAnalyzerWrapper;
+import org.apache.lucene.analysis.shingle.ShingleAnalyzerWrapper;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
@@ -71,7 +76,11 @@ public class LuceneIndexEditorContext {
ClassLoader loader = thread.getContextClassLoader();
thread.setContextClassLoader(IndexWriterConfig.class.getClassLoader());
try {
- IndexWriterConfig config = new IndexWriterConfig(VERSION,
definition.getAnalyzer());
+ Analyzer definitionAnalyzer = definition.getAnalyzer();
+ Map<String, Analyzer> analyzers = new HashMap<String, Analyzer>();
+ analyzers.put(FieldNames.SPELLCHECK, new
ShingleAnalyzerWrapper(LuceneIndexConstants.ANALYZER, 3));
+ Analyzer analyzer = new
PerFieldAnalyzerWrapper(definitionAnalyzer, analyzers);
+ IndexWriterConfig config = new IndexWriterConfig(VERSION,
analyzer);
if (remoteDir) {
config.setMergeScheduler(new SerialMergeScheduler());
}
Modified:
jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java?rev=1738066&r1=1738065&r2=1738066&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
Thu Apr 7 01:19:13 2016
@@ -25,7 +25,6 @@ import javax.jcr.PropertyType;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
import java.util.Deque;
import java.util.Iterator;
import java.util.List;
@@ -417,7 +416,6 @@ public class LucenePropertyIndex impleme
SuggestWord[] suggestWords =
SpellcheckHelper.getSpellcheck(spellcheckQuery);
// ACL filter spellchecks
- Collection<String> suggestedWords = new
ArrayList<String>(suggestWords.length);
QueryParser qp = new QueryParser(Version.LUCENE_47,
FieldNames.FULLTEXT, indexNode.getDefinition().getAnalyzer());
for (SuggestWord suggestion : suggestWords) {
Query query =
qp.createPhraseQuery(FieldNames.FULLTEXT, suggestion.string);
@@ -426,14 +424,13 @@ public class LucenePropertyIndex impleme
for (ScoreDoc doc : topDocs.scoreDocs) {
Document retrievedDoc =
searcher.doc(doc.doc);
if
(filter.isAccessible(retrievedDoc.get(FieldNames.PATH))) {
- suggestedWords.add(suggestion.string);
+ queue.add(new
LuceneResultRow(suggestion.string));
break;
}
}
}
}
- queue.add(new LuceneResultRow(suggestedWords));
noDocs = true;
} else if (luceneRequestFacade.getLuceneRequest()
instanceof SuggestHelper.SuggestQuery) {
SuggestHelper.SuggestQuery suggestQuery =
(SuggestHelper.SuggestQuery) luceneRequestFacade.getLuceneRequest();
@@ -441,7 +438,6 @@ public class LucenePropertyIndex impleme
List<Lookup.LookupResult> lookupResults =
SuggestHelper.getSuggestions(suggestQuery);
// ACL filter suggestions
- Collection<String> suggestedWords = new
ArrayList<String>(lookupResults.size());
QueryParser qp = new QueryParser(Version.LUCENE_47,
FieldNames.SUGGEST, indexNode.getDefinition().getAnalyzer());
for (Lookup.LookupResult suggestion : lookupResults) {
Query query =
qp.createPhraseQuery(FieldNames.SUGGEST, suggestion.key.toString());
@@ -450,14 +446,13 @@ public class LucenePropertyIndex impleme
for (ScoreDoc doc : topDocs.scoreDocs) {
Document retrievedDoc =
searcher.doc(doc.doc);
if
(filter.isAccessible(retrievedDoc.get(FieldNames.PATH))) {
- suggestedWords.add("{term=" +
suggestion.key + ",weight=" + suggestion.value + "}");
+ queue.add(new
LuceneResultRow(suggestion.key.toString(), suggestion.value));
break;
}
}
}
}
- queue.add(new LuceneResultRow(suggestedWords));
noDocs = true;
}
} catch (IOException e) {
@@ -1333,7 +1328,7 @@ public class LucenePropertyIndex impleme
static class LuceneResultRow {
final String path;
final double score;
- final Iterable<String> suggestWords;
+ final String suggestion;
final boolean isVirutal;
final String excerpt;
final String explanation;
@@ -1344,18 +1339,22 @@ public class LucenePropertyIndex impleme
this.isVirutal = false;
this.path = path;
this.score = score;
- this.suggestWords = Collections.emptySet();
+ this.suggestion = null;
}
- LuceneResultRow(Iterable<String> suggestWords) {
+ LuceneResultRow(String suggestion, long weight) {
this.isVirutal = true;
this.path = "/";
- this.score = 1.0d;
- this.suggestWords = suggestWords;
+ this.score = weight;
+ this.suggestion = suggestion;
this.excerpt = null;
this.explanation = null;
}
+ LuceneResultRow(String suggestion) {
+ this(suggestion, 1);
+ }
+
@Override
public String toString() {
return String.format("%s (%1.2f)", path, score);
@@ -1437,7 +1436,7 @@ public class LucenePropertyIndex impleme
return PropertyValues.newDouble(currentRow.score);
}
if (QueryImpl.REP_SPELLCHECK.equals(columnName) ||
QueryImpl.REP_SUGGEST.equals(columnName)) {
- return
PropertyValues.newString(Iterables.toString(currentRow.suggestWords));
+ return PropertyValues.newString(currentRow.suggestion);
}
if (QueryImpl.OAK_SCORE_EXPLANATION.equals(columnName)) {
return
PropertyValues.newString(currentRow.explanation);
Modified:
jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/SpellcheckTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/SpellcheckTest.java?rev=1738066&r1=1738065&r2=1738066&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/SpellcheckTest.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/SpellcheckTest.java
Thu Apr 7 01:19:13 2016
@@ -27,8 +27,11 @@ import javax.jcr.query.QueryResult;
import javax.jcr.query.Row;
import javax.jcr.query.RowIterator;
+import com.google.common.collect.Lists;
import org.apache.jackrabbit.core.query.AbstractQueryTest;
+import java.util.List;
+
/**
* Tests the spellcheck support.
*/
@@ -45,9 +48,9 @@ public class SpellcheckTest extends Abst
String sql = "SELECT [rep:spellcheck()] FROM nt:base WHERE [jcr:path]
= '/' AND SPELLCHECK('helo')";
Query q = qm.createQuery(sql, Query.SQL);
- String result = getResult(q.execute(), "rep:spellcheck()");
+ List<String> result = getResult(q.execute(), "rep:spellcheck()");
assertNotNull(result);
- assertEquals("[hello, hold]", result);
+ assertEquals("[hello, hold]", result.toString());
}
public void testSpellcheckXPath() throws Exception {
@@ -61,22 +64,39 @@ public class SpellcheckTest extends Abst
String xpath = "/jcr:root[rep:spellcheck('helo')]/(rep:spellcheck())";
Query q = qm.createQuery(xpath, Query.XPATH);
- String result = getResult(q.execute(), "rep:spellcheck()");
+ List<String> result = getResult(q.execute(), "rep:spellcheck()");
+ assertNotNull(result);
+ assertEquals("[hello, hold]", result.toString());
+ }
+
+ public void testSpellcheckMultipleWords() throws Exception {
+ Session session = superuser;
+ QueryManager qm = session.getWorkspace().getQueryManager();
+ Node n1 = testRootNode.addNode("node1");
+ n1.setProperty("jcr:title", "it is always a good idea to go visiting
ontario");
+ Node n2 = testRootNode.addNode("node2");
+ n2.setProperty("jcr:title", "ontario is a nice place to live in");
+ Node n3 = testRootNode.addNode("node3");
+ n2.setProperty("jcr:title", "I flied to ontario for voting for the
major polls");
+ Node n4 = testRootNode.addNode("node4");
+ n2.setProperty("jcr:title", "I will go voting in ontario, I always
voted since I've been allowed to");
+ session.save();
+
+ String xpath = "/jcr:root[rep:spellcheck('votin in
ontari')]/(rep:spellcheck())";
+ Query q = qm.createQuery(xpath, Query.XPATH);
+ List<String> result = getResult(q.execute(), "rep:spellcheck()");
assertNotNull(result);
- assertEquals("[hello, hold]", result);
+ assertEquals("[voting in ontario]", result.toString());
}
- static String getResult(QueryResult result, String propertyName) throws
RepositoryException {
- StringBuilder buff = new StringBuilder();
+ static List<String> getResult(QueryResult result, String propertyName)
throws RepositoryException {
+ List<String> results = Lists.newArrayList();
RowIterator it = result.getRows();
while (it.hasNext()) {
- if (buff.length() > 0) {
- buff.append(", ");
- }
Row row = it.nextRow();
- buff.append(row.getValue(propertyName).getString());
+ results.add(row.getValue(propertyName).getString());
}
- return buff.toString();
+ return results;
}
}
\ No newline at end of file
Modified:
jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/SuggestTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/SuggestTest.java?rev=1738066&r1=1738065&r2=1738066&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/SuggestTest.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/SuggestTest.java
Thu Apr 7 01:19:13 2016
@@ -27,10 +27,13 @@ import javax.jcr.query.QueryResult;
import javax.jcr.query.Row;
import javax.jcr.query.RowIterator;
+import com.google.common.collect.Lists;
import org.apache.jackrabbit.core.query.AbstractQueryTest;
import org.junit.After;
import org.junit.Before;
+import java.util.List;
+
/**
* Tests the suggest support.
*/
@@ -64,10 +67,10 @@ public class SuggestTest extends Abstrac
String sql = "SELECT [rep:suggest()] FROM nt:base WHERE [jcr:path] =
'/' AND SUGGEST('in 201')";
Query q = qm.createQuery(sql, Query.SQL);
- String result = getResult(q.execute(), "rep:suggest()");
+ List<String> result = getResult(q.execute(), "rep:suggest()");
assertNotNull(result);
- assertTrue(result.contains("[{term=in 2015 a red fox is still a
fox,weight="));
- assertTrue(result.contains("{term=in 2015 my fox is red, like mike's
fox and john's fox,weight="));
+ assertTrue(result.contains("in 2015 a red fox is still a fox"));
+ assertTrue(result.contains("in 2015 my fox is red, like mike's fox and
john's fox"));
}
public void testSuggestXPath() throws Exception {
@@ -81,10 +84,10 @@ public class SuggestTest extends Abstrac
String xpath = "/jcr:root[rep:suggest('in 201')]/(rep:suggest())";
Query q = qm.createQuery(xpath, Query.XPATH);
- String result = getResult(q.execute(), "rep:suggest()");
+ List<String> result = getResult(q.execute(), "rep:suggest()");
assertNotNull(result);
- assertTrue(result.contains("[{term=in 2015 a red fox is still a
fox,weight="));
- assertTrue(result.contains("{term=in 2015 my fox is red, like mike's
fox and john's fox,weight="));
+ assertTrue(result.contains("in 2015 a red fox is still a fox"));
+ assertTrue(result.contains("in 2015 my fox is red, like mike's fox and
john's fox"));
}
public void testNoSuggestions() throws Exception {
@@ -98,22 +101,19 @@ public class SuggestTest extends Abstrac
String sql = "SELECT [rep:suggest()] FROM nt:base WHERE [jcr:path] =
'/' AND SUGGEST('blablabla')";
Query q = qm.createQuery(sql, Query.SQL);
- String result = getResult(q.execute(), "rep:suggest()");
- assertNotNull(result);
- assertEquals("[]", result);
+ List<String> results = getResult(q.execute(), "rep:suggest()");
+ assertNotNull(results);
+ assertEquals(0, results.size());
}
- static String getResult(QueryResult result, String propertyName) throws
RepositoryException {
- StringBuilder buff = new StringBuilder();
+ static List<String> getResult(QueryResult result, String propertyName)
throws RepositoryException {
+ List<String> results = Lists.newArrayList();
RowIterator it = result.getRows();
while (it.hasNext()) {
- if (buff.length() > 0) {
- buff.append(", ");
- }
Row row = it.nextRow();
- buff.append(row.getValue(propertyName).getString());
+ results.add(row.getValue(propertyName).getString());
}
- return buff.toString();
+ return results;
}
}
\ No newline at end of file
Modified:
jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexSuggestionTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexSuggestionTest.java?rev=1738066&r1=1738065&r2=1738066&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexSuggestionTest.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexSuggestionTest.java
Thu Apr 7 01:19:13 2016
@@ -119,8 +119,10 @@ public class LuceneIndexSuggestionTest {
throws Exception {
createSuggestIndex("lucene-suggest", indexNodeType, indexPropName,
addFullText);
- Node indexedNode = root.addNode("indexedNode", queryNodeType);
- indexedNode.setProperty(indexPropName, indexPropValue);
+ Node indexedNode = root.addNode("indexedNode1", queryNodeType);
+ indexedNode.setProperty(indexPropName, indexPropValue + " 1");
+ indexedNode = root.addNode("indexedNode2", queryNodeType);
+ indexedNode.setProperty(indexPropName, indexPropValue + " 2");
if (useUserSession) {
session.getUserManager().createUser(TEST_USER_NAME,
TEST_USER_NAME);
}
@@ -140,51 +142,20 @@ public class LuceneIndexSuggestionTest {
RowIterator rows = result.getRows();
String value = null;
- if (rows.hasNext()) {
+ while (rows.hasNext()) {
Row firstRow = rows.nextRow();
value = firstRow.getValue("suggestion").getString();
}
- Suggestion suggestion = Suggestion.fromString(value);
if (shouldSuggest) {
- assertNotNull("There should be some suggestion",
suggestion.getSuggestion());
+ assertNotNull("There should be some suggestion", value);
} else {
- assertNull("There shouldn't be any suggestion",
suggestion.getSuggestion());
+ assertNull("There shouldn't be any suggestion", value);
}
}
private String createSuggestQuery(String nodeTypeName, String suggestFor) {
- return "SELECT [rep:suggest()] as suggestion FROM [" + nodeTypeName +
"] WHERE suggest('" + suggestFor + "')";
- }
-
- static class Suggestion {
- private final long weight;
- private final String suggestion;
- Suggestion(String suggestion, long weight) {
- this.suggestion = suggestion;
- this.weight = weight;
- }
-
- long getWeight() {
- return weight;
- }
-
- String getSuggestion() {
- return suggestion;
- }
-
- static Suggestion fromString(String suggestionResultStr) {
- if (suggestionResultStr==null || "".equals(suggestionResultStr) ||
"[]".equals(suggestionResultStr)) {
- return new Suggestion(null, -1);
- }
-
- String [] parts = suggestionResultStr.split(",weight=", 2);
- int endWeightIdx = parts[1].lastIndexOf("}");
- long weight = Long.parseLong(parts[1].substring(0, endWeightIdx));
- String suggestion = parts[0].split("=", 2)[1];
-
- return new Suggestion(suggestion, weight);
- }
+ return "SELECT [rep:suggest()] as suggestion, [jcr:score] as score
FROM [" + nodeTypeName + "] WHERE suggest('" + suggestFor + "')";
}
//OAK-3157
@@ -239,6 +210,21 @@ public class LuceneIndexSuggestionTest {
final String nodeType = "oak:Unstructured";
final String indexPropName = "description";
final String indexPropValue = "this is just a sample text which should
get some response in suggestions";
+ final String suggestQueryText = "th";
+ final boolean shouldSuggest = true;
+
+ checkSuggestions(nodeType,
+ indexPropName, indexPropValue,
+ true, false,
+ suggestQueryText, shouldSuggest);
+ }
+
+ //OAK-3509
+ @Test
+ public void testMultipleSuggestions() throws Exception {
+ final String nodeType = "oak:Unstructured";
+ final String indexPropName = "description";
+ final String indexPropValue = "this is just a sample text which should
get some response in suggestions";
final String suggestQueryText = "th";
final boolean shouldSuggest = true;
Modified:
jackrabbit/oak/branches/1.2/oak-lucene/src/test/resources/org/apache/jackrabbit/oak/query/sql1.txt
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-lucene/src/test/resources/org/apache/jackrabbit/oak/query/sql1.txt?rev=1738066&r1=1738065&r2=1738066&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-lucene/src/test/resources/org/apache/jackrabbit/oak/query/sql1.txt
(original)
+++
jackrabbit/oak/branches/1.2/oak-lucene/src/test/resources/org/apache/jackrabbit/oak/query/sql1.txt
Thu Apr 7 01:19:13 2016
@@ -27,7 +27,7 @@
# sql-1 query (nt:unstructured needs to be escaped in sql-2)
sql1 SELECT [rep:spellcheck()] FROM nt:base WHERE [jcr:path] = '/' AND
SPELLCHECK('jackrabit')
-[jackrabbit], /, 1.0
+jackrabbit, /, 1.0
sql1 select prop1 from nt:unstructured where prop1 is not null order by prop1
asc
