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 ca...@apache.org on 2016/04/07 03:31:27 UTC
svn commit: r1738068 - in /jackrabbit/oak/branches/1.2: ./
oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/
oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/
oak-lucene/src/test/java/org/apache/jackra...
Author: catholicon
Date: Thu Apr 7 01:31:27 2016
New Revision: 1738068
URL: http://svn.apache.org/viewvc?rev=1738068&view=rev
Log:
OAK-3149 - each index has its own (persisted) suggester if suggest is enabled (backport r1716100 to 1.2 branch)
Conflicts:
(awkward merge due to missing OAK-2808)
oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/OakDirectory.java
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/FieldFactory.java
jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexNode.java
jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java
jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor.java
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/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/OakDirectory.java
jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/SuggestHelper.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/IndexPlannerTest.java
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 7 01:31:27 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,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/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,1716100,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,172418
6,1724210,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/FieldFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/FieldFactory.java?rev=1738068&r1=1738067&r2=1738068&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/FieldFactory.java (original)
+++ jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/FieldFactory.java Thu Apr 7 01:31:27 2016
@@ -134,7 +134,7 @@ public final class FieldFactory {
}
builder.append(v);
}
- return new OakTextField(FieldNames.SUGGEST, builder.toString(), true);
+ return new OakTextField(FieldNames.SUGGEST, builder.toString(), false);
}
/**
Modified: jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexNode.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexNode.java?rev=1738068&r1=1738067&r2=1738068&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexNode.java (original)
+++ jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexNode.java Thu Apr 7 01:31:27 2016
@@ -30,24 +30,26 @@ import java.util.concurrent.locks.Reentr
import javax.annotation.Nullable;
import org.apache.jackrabbit.oak.commons.PathUtils;
+import org.apache.jackrabbit.oak.plugins.index.lucene.util.SuggestHelper;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.spi.state.ReadOnlyBuilder;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.suggest.analyzing.AnalyzingInfixSuggester;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.FSDirectory;
class IndexNode {
- static IndexNode open(String indexPath, NodeState root, NodeState defnNodeState,@Nullable IndexCopier cloner)
+ static IndexNode open(String indexPath, NodeState root, NodeState defnNodeState, @Nullable IndexCopier cloner)
throws IOException {
Directory directory = null;
IndexDefinition definition = new IndexDefinition(root, defnNodeState, indexPath);
NodeState data = defnNodeState.getChildNode(INDEX_DATA_CHILD_NAME);
if (data.exists()) {
directory = new OakDirectory(new ReadOnlyBuilder(data), definition, true);
- if (cloner != null){
+ if (cloner != null) {
directory = cloner.wrapForRead(indexPath, definition, directory);
}
} else if (PERSISTENCE_FILE.equalsIgnoreCase(defnNodeState.getString(PERSISTENCE_NAME))) {
@@ -59,7 +61,12 @@ class IndexNode {
if (directory != null) {
try {
- IndexNode index = new IndexNode(PathUtils.getName(indexPath), definition, directory);
+ OakDirectory suggestDirectory = null;
+ if (definition.isSuggestEnabled()) {
+ suggestDirectory = new OakDirectory(defnNodeState.builder(), ":suggest-data", definition, false);
+ }
+
+ IndexNode index = new IndexNode(PathUtils.getName(indexPath), definition, directory, suggestDirectory);
directory = null; // closed in Index.close()
return index;
} finally {
@@ -84,15 +91,22 @@ class IndexNode {
private final ReadWriteLock lock = new ReentrantReadWriteLock();
+ private final AnalyzingInfixSuggester lookup;
+
private boolean closed = false;
- IndexNode(String name, IndexDefinition definition, Directory directory)
+ IndexNode(String name, IndexDefinition definition, Directory directory, final OakDirectory suggestDirectory)
throws IOException {
this.name = name;
this.definition = definition;
this.directory = directory;
this.reader = DirectoryReader.open(directory);
this.searcher = new IndexSearcher(reader);
+ if (suggestDirectory != null) {
+ this.lookup = SuggestHelper.getLookup(suggestDirectory, definition.getAnalyzer());
+ } else {
+ this.lookup = null;
+ }
}
String getName() {
@@ -107,6 +121,10 @@ class IndexNode {
return searcher;
}
+ AnalyzingInfixSuggester getLookup() {
+ return lookup;
+ }
+
boolean acquire() {
lock.readLock().lock();
if (closed) {
Modified: jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java?rev=1738068&r1=1738067&r2=1738068&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java (original)
+++ jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java Thu Apr 7 01:31:27 2016
@@ -407,7 +407,7 @@ public class LuceneIndex implements Adva
noDocs = true;
} else if (luceneRequestFacade.getLuceneRequest() instanceof SuggestHelper.SuggestQuery) {
SuggestHelper.SuggestQuery suggestQuery = (SuggestHelper.SuggestQuery) luceneRequestFacade.getLuceneRequest();
- List<Lookup.LookupResult> lookupResults = SuggestHelper.getSuggestions(suggestQuery);
+ List<Lookup.LookupResult> lookupResults = SuggestHelper.getSuggestions(indexNode.getLookup(), suggestQuery);
// ACL filter suggestions
Collection<String> suggestedWords = new ArrayList<String>(lookupResults.size());
Modified: jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor.java?rev=1738068&r1=1738067&r2=1738068&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor.java (original)
+++ jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor.java Thu Apr 7 01:31:27 2016
@@ -380,7 +380,7 @@ public class LuceneIndexEditor implement
// because of LUCENE-5833 we have to merge the suggest fields into a single one
Field suggestField = null;
for (Field f : fields) {
- if (FieldNames.SUGGEST.endsWith(f.name())) {
+ if (FieldNames.SUGGEST.equals(f.name())) {
if (suggestField == null) {
suggestField = FieldFactory.newSuggestField(f.stringValue());
} else {
@@ -425,7 +425,7 @@ public class LuceneIndexEditor implement
}
if (pd.useInSuggest) {
- fields.add(newPropertyField(FieldNames.SUGGEST, value, true, true));
+ fields.add(FieldFactory.newSuggestField(value));
}
if (pd.useInSpellcheck) {
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=1738068&r1=1738067&r2=1738068&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:31:27 2016
@@ -79,6 +79,7 @@ public class LuceneIndexEditorContext {
Analyzer definitionAnalyzer = definition.getAnalyzer();
Map<String, Analyzer> analyzers = new HashMap<String, Analyzer>();
analyzers.put(FieldNames.SPELLCHECK, new ShingleAnalyzerWrapper(LuceneIndexConstants.ANALYZER, 3));
+ analyzers.put(FieldNames.SUGGEST, SuggestHelper.getAnalyzer());
Analyzer analyzer = new PerFieldAnalyzerWrapper(definitionAnalyzer, analyzers);
IndexWriterConfig config = new IndexWriterConfig(VERSION, analyzer);
if (remoteDir) {
@@ -136,7 +137,6 @@ public class LuceneIndexEditorContext {
@Nullable
private final IndexCopier indexCopier;
-
private Directory directory;
private final TextExtractionStats textExtractionStats = new TextExtractionStats();
@@ -190,12 +190,12 @@ public class LuceneIndexEditorContext {
checkNotNull(writer);
checkNotNull(definition);
checkNotNull(directory);
-
+
int docs = writer.numDocs();
int ram = writer.numRamDocs();
log.trace("Writer for direcory {} - docs: {}, ramDocs: {}", definition, docs, ram);
-
+
String[] files = directory.listAll();
long overallSize = 0;
StringBuilder sb = new StringBuilder();
@@ -231,18 +231,18 @@ public class LuceneIndexEditorContext {
if (log.isTraceEnabled()) {
trackIndexSizeInfo(writer, definition, directory);
}
-
+
final long start = PERF_LOGGER.start();
-
- updateSuggester();
+
+ updateSuggester(writer.getAnalyzer());
PERF_LOGGER.end(start, -1, "Completed suggester for directory {}", definition);
-
+
writer.close();
PERF_LOGGER.end(start, -1, "Closed writer for directory {}", definition);
-
+
directory.close();
PERF_LOGGER.end(start, -1, "Closed directory for directory {}", definition);
-
+
//OAK-2029 Record the last updated status so
//as to make IndexTracker detect changes when index
//is stored in file system
@@ -250,7 +250,7 @@ public class LuceneIndexEditorContext {
status.setProperty("lastUpdated", ISO8601.format(Calendar.getInstance()), Type.DATE);
status.setProperty("indexedNodes",indexedNodes);
PERF_LOGGER.end(start, -1, "Overall Closed IndexWriter for directory {}", definition);
-
+
textExtractionStats.log(reindex);
textExtractionStats.collectStats(extractedTextCache);
}
@@ -259,8 +259,9 @@ public class LuceneIndexEditorContext {
/**
* eventually update suggest dictionary
* @throws IOException if suggest dictionary update fails
+ * @param analyzer the analyzer used to update the suggester
*/
- private void updateSuggester() throws IOException {
+ private void updateSuggester(Analyzer analyzer) throws IOException {
if (definition.isSuggestEnabled()) {
@@ -280,12 +281,14 @@ public class LuceneIndexEditorContext {
if (updateSuggester) {
DirectoryReader reader = DirectoryReader.open(writer, false);
+ final OakDirectory suggestDirectory = new OakDirectory(definitionBuilder, ":suggest-data", definition, false);
try {
- SuggestHelper.updateSuggester(reader);
+ SuggestHelper.updateSuggester(suggestDirectory, analyzer, reader);
suggesterStatus.setProperty("lastUpdated", ISO8601.format(Calendar.getInstance()), Type.DATE);
} catch (Throwable e) {
log.warn("could not update suggester", e);
} finally {
+ suggestDirectory.close();
reader.close();
}
}
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=1738068&r1=1738067&r2=1738068&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:31:27 2016
@@ -32,7 +32,6 @@ import java.util.Set;
import java.util.concurrent.atomic.AtomicReference;
import com.google.common.collect.AbstractIterator;
-import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.collect.Queues;
import com.google.common.collect.Sets;
@@ -78,6 +77,7 @@ import org.apache.lucene.index.MultiFiel
import org.apache.lucene.index.StoredFieldVisitor;
import org.apache.lucene.index.Term;
import org.apache.lucene.queries.CustomScoreQuery;
+import org.apache.lucene.queryparser.classic.MultiFieldQueryParser;
import org.apache.lucene.queryparser.classic.ParseException;
import org.apache.lucene.queryparser.classic.QueryParser;
import org.apache.lucene.queryparser.flexible.core.QueryNodeException;
@@ -412,13 +412,14 @@ public class LucenePropertyIndex impleme
}
}
} else if (luceneRequestFacade.getLuceneRequest() instanceof SpellcheckHelper.SpellcheckQuery) {
+ String aclCheckField = indexNode.getDefinition().isFullTextEnabled() ? FieldNames.FULLTEXT : FieldNames.SPELLCHECK;
SpellcheckHelper.SpellcheckQuery spellcheckQuery = (SpellcheckHelper.SpellcheckQuery) luceneRequestFacade.getLuceneRequest();
SuggestWord[] suggestWords = SpellcheckHelper.getSpellcheck(spellcheckQuery);
// ACL filter spellchecks
- QueryParser qp = new QueryParser(Version.LUCENE_47, FieldNames.FULLTEXT, indexNode.getDefinition().getAnalyzer());
+ QueryParser qp = new QueryParser(Version.LUCENE_47, aclCheckField, indexNode.getDefinition().getAnalyzer());
for (SuggestWord suggestion : suggestWords) {
- Query query = qp.createPhraseQuery(FieldNames.FULLTEXT, suggestion.string);
+ Query query = qp.createPhraseQuery(aclCheckField, suggestion.string);
TopDocs topDocs = searcher.search(query, 100);
if (topDocs.totalHits > 0) {
for (ScoreDoc doc : topDocs.scoreDocs) {
@@ -435,12 +436,13 @@ public class LucenePropertyIndex impleme
} else if (luceneRequestFacade.getLuceneRequest() instanceof SuggestHelper.SuggestQuery) {
SuggestHelper.SuggestQuery suggestQuery = (SuggestHelper.SuggestQuery) luceneRequestFacade.getLuceneRequest();
- List<Lookup.LookupResult> lookupResults = SuggestHelper.getSuggestions(suggestQuery);
+ List<Lookup.LookupResult> lookupResults = SuggestHelper.getSuggestions(indexNode.getLookup(), suggestQuery);
+ Collection<String> indexedFields = MultiFields.getIndexedFields(searcher.getIndexReader());
+ QueryParser qp = new MultiFieldQueryParser(Version.LUCENE_47, indexedFields.toArray(new String[indexedFields.size()]), indexNode.getDefinition().getAnalyzer());
// ACL filter suggestions
- 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());
+ Query query = qp.parse("\"" + suggestion.key.toString() + "\"");
TopDocs topDocs = searcher.search(query, 100);
if (topDocs.totalHits > 0) {
for (ScoreDoc doc : topDocs.scoreDocs) {
@@ -455,7 +457,7 @@ public class LucenePropertyIndex impleme
noDocs = true;
}
- } catch (IOException e) {
+ } catch (Exception e) {
LOG.warn("query via {} failed.", LucenePropertyIndex.this, e);
} finally {
indexNode.release();
Modified: jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/OakDirectory.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/OakDirectory.java?rev=1738068&r1=1738067&r2=1738068&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/OakDirectory.java (original)
+++ jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/OakDirectory.java Thu Apr 7 01:31:27 2016
@@ -73,8 +73,12 @@ class OakDirectory extends Directory {
private final String indexName;
public OakDirectory(NodeBuilder directoryBuilder, IndexDefinition definition, boolean readOnly) {
+ this(directoryBuilder, null, definition, readOnly);
+ }
+
+ public OakDirectory(NodeBuilder builder, String dataNodeName, IndexDefinition definition, boolean readOnly) {
this.lockFactory = NoLockFactory.getNoLockFactory();
- this.directoryBuilder = directoryBuilder;
+ this.directoryBuilder = (dataNodeName == null) ? builder : builder.child(dataNodeName);
this.definition = definition;
this.readOnly = readOnly;
this.fileNames.addAll(getListing());
Modified: jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/SuggestHelper.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/SuggestHelper.java?rev=1738068&r1=1738067&r2=1738068&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/SuggestHelper.java (original)
+++ jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/SuggestHelper.java Thu Apr 7 01:31:27 2016
@@ -18,17 +18,22 @@
*/
package org.apache.jackrabbit.oak.plugins.index.lucene.util;
+import java.io.File;
import java.io.IOException;
import java.io.Reader;
import java.util.Collections;
import java.util.List;
+import com.google.common.io.Files;
import org.apache.jackrabbit.oak.plugins.index.lucene.FieldNames;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.search.suggest.DocumentDictionary;
+import org.apache.lucene.search.spell.Dictionary;
+import org.apache.lucene.search.spell.LuceneDictionary;
import org.apache.lucene.search.suggest.Lookup;
-import org.apache.lucene.search.suggest.analyzing.FreeTextSuggester;
+import org.apache.lucene.search.suggest.analyzing.AnalyzingInfixSuggester;
+import org.apache.lucene.store.Directory;
+import org.apache.lucene.store.FSDirectory;
import org.apache.lucene.util.Version;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -48,29 +53,20 @@ public class SuggestHelper {
}
};
- private static final Lookup suggester = new FreeTextSuggester(analyzer);
-
- public static void updateSuggester(IndexReader reader) throws IOException {
-// Terms terms = MultiFields.getTerms(reader, FieldNames.SUGGEST);
-// long size = terms.size() * 2;
-// if (size < 0) {
-// size = terms.getDocCount() / 3;
-// }
-// long count = suggester.getCount();
-// if (size > count) {
- try {
- suggester.build(new DocumentDictionary(reader, FieldNames.SUGGEST, FieldNames.PATH_DEPTH));
- } catch (RuntimeException e) {
- log.debug("could not update the suggester", e);
- }
-// }
+ public static void updateSuggester(Directory directory, Analyzer analyzer, IndexReader reader) throws IOException {
+ try {
+ Dictionary dictionary = new LuceneDictionary(reader, FieldNames.SUGGEST);
+ getLookup(directory, analyzer).build(dictionary);
+ } catch (RuntimeException e) {
+ log.debug("could not update the suggester", e);
+ }
}
- public static List<Lookup.LookupResult> getSuggestions(SuggestQuery suggestQuery) {
+ public static List<Lookup.LookupResult> getSuggestions(AnalyzingInfixSuggester suggester, SuggestQuery suggestQuery) {
try {
long count = suggester.getCount();
if (count > 0) {
- return suggester.lookup(suggestQuery.getText(), false, 10);
+ return suggester.lookup(suggestQuery.getText(), 10, true, false);
} else {
return Collections.emptyList();
}
@@ -103,6 +99,28 @@ public class SuggestHelper {
}
}
+ public static AnalyzingInfixSuggester getLookup(final Directory suggestDirectory) throws IOException {
+ return getLookup(suggestDirectory, SuggestHelper.analyzer);
+ }
+
+ public static AnalyzingInfixSuggester getLookup(final Directory suggestDirectory, Analyzer analyzer) throws IOException {
+ final File tempDir = Files.createTempDir();
+ return new AnalyzingInfixSuggester(Version.LUCENE_47, tempDir, analyzer, analyzer, 3) {
+ @Override
+ protected Directory getDirectory(File path) throws IOException {
+ if (tempDir.getAbsolutePath().equals(path.getAbsolutePath())) {
+ return suggestDirectory; // use oak directory for writing suggest index
+ } else {
+ return FSDirectory.open(path); // use FS for temp index used at build time
+ }
+ }
+ };
+ }
+
+ public static Analyzer getAnalyzer() {
+ return analyzer;
+ }
+
public static class SuggestQuery {
private final String text;
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=1738068&r1=1738067&r2=1738068&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:31:27 2016
@@ -90,6 +90,22 @@ public class SuggestTest extends Abstrac
assertTrue(result.contains("in 2015 my fox is red, like mike's fox and john's fox"));
}
+ public void testSuggestInfix() throws Exception {
+ Session session = superuser;
+ QueryManager qm = session.getWorkspace().getQueryManager();
+ Node n1 = testRootNode.addNode("node1");
+ n1.setProperty("jcr:title", "in 2015 my fox is red, like mike's fox and john's fox");
+ Node n2 = testRootNode.addNode("node2");
+ n2.setProperty("jcr:title", "in 2015 a red fox is still a fox");
+ session.save();
+
+ String xpath = "/jcr:root[rep:suggest('like mike')]/(rep:suggest())";
+ Query q = qm.createQuery(xpath, Query.XPATH);
+ List<String> result = getResult(q.execute(), "rep:suggest()");
+ assertNotNull(result);
+ assertTrue(result.contains("in 2015 my fox is red, like mike's fox and john's fox"));
+ }
+
public void testNoSuggestions() throws Exception {
Session session = superuser;
QueryManager qm = session.getWorkspace().getQueryManager();
Modified: jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlannerTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlannerTest.java?rev=1738068&r1=1738067&r2=1738068&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlannerTest.java (original)
+++ jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlannerTest.java Thu Apr 7 01:31:27 2016
@@ -460,11 +460,11 @@ public class IndexPlannerTest {
}
private IndexNode createIndexNode(IndexDefinition defn, long numOfDocs) throws IOException {
- return new IndexNode("foo", defn, createSampleDirectory(numOfDocs));
+ return new IndexNode("foo", defn, createSampleDirectory(numOfDocs), null);
}
private IndexNode createIndexNode(IndexDefinition defn) throws IOException {
- return new IndexNode("foo", defn, createSampleDirectory());
+ return new IndexNode("foo", defn, createSampleDirectory(), null);
}
private FilterImpl createFilter(String nodeTypeName) {