svn commit: r1754484 - in /jackrabbit/oak/trunk/oak-lucene/src: main/java/org/apache/jackrabbit/oak/plugins/index/lucene/ test/java/org/apache/jackrabbit/oak/plugins/index/lucene/

[ch...@apache.org]

Author: chetanm
Date: Fri Jul 29 08:29:52 2016
New Revision: 1754484

URL: http://svn.apache.org/viewvc?rev=1754484&view=rev
Log:
OAK-4616 - Record suggestor status in suggest-data node

Modified:
    jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexConstants.java
    jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorContext.java
    jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/SuggestionIntervalTest.java

Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexConstants.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexConstants.java?rev=1754484&r1=1754483&r2=1754484&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexConstants.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexConstants.java Fri Jul 29 08:29:52 2016
@@ -28,6 +28,8 @@ public interface LuceneIndexConstants {
 
     String INDEX_DATA_CHILD_NAME = ":data";
 
+    String SUGGEST_DATA_CHILD_NAME = ":suggest-data";
+
     String TRASH_CHILD_NAME = ":trash";
 
     Version VERSION = Version.LUCENE_47;

Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorContext.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorContext.java?rev=1754484&r1=1754483&r2=1754484&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorContext.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorContext.java Fri Jul 29 08:29:52 2016
@@ -61,6 +61,7 @@ import org.slf4j.LoggerFactory;
 import static com.google.common.base.Preconditions.checkNotNull;
 import static org.apache.jackrabbit.oak.commons.IOUtils.humanReadableByteCount;
 import static org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.PERSISTENCE_PATH;
+import static org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.SUGGEST_DATA_CHILD_NAME;
 import static org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.VERSION;
 import static org.apache.lucene.store.NoLockFactory.getNoLockFactory;
 
@@ -296,9 +297,9 @@ public class LuceneIndexEditorContext {
      */
     private Calendar updateSuggester(Analyzer analyzer) throws IOException {
         Calendar ret = null;
-        NodeBuilder suggesterStatus = definitionBuilder.child(":suggesterStatus");
+        NodeBuilder suggesterStatus = definitionBuilder.child(SUGGEST_DATA_CHILD_NAME);
         DirectoryReader reader = DirectoryReader.open(writer, false);
-        final OakDirectory suggestDirectory = new OakDirectory(definitionBuilder, ":suggest-data", definition, false);
+        final OakDirectory suggestDirectory = new OakDirectory(definitionBuilder, SUGGEST_DATA_CHILD_NAME, definition, false);
         try {
             SuggestHelper.updateSuggester(suggestDirectory, analyzer, reader);
             ret = getCalendar();
@@ -323,7 +324,7 @@ public class LuceneIndexEditorContext {
         boolean updateSuggestions = false;
 
         if (definition.isSuggestEnabled()) {
-            NodeBuilder suggesterStatus = definitionBuilder.child(":suggesterStatus");
+            NodeBuilder suggesterStatus = definitionBuilder.child(SUGGEST_DATA_CHILD_NAME);
 
             PropertyState suggesterLastUpdatedValue = suggesterStatus.getProperty("lastUpdated");
 

Modified: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/SuggestionIntervalTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/SuggestionIntervalTest.java?rev=1754484&r1=1754483&r2=1754484&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/SuggestionIntervalTest.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/SuggestionIntervalTest.java Fri Jul 29 08:29:52 2016
@@ -207,7 +207,7 @@ public class SuggestionIntervalTest exte
     }
 
     private String getSuggestionLastUpdated(Tree indexDef) {
-        Tree suggStat = root.getTree(indexDef.getPath() + "/" + ":suggesterStatus");
+        Tree suggStat = root.getTree(indexDef.getPath() + "/" + LuceneIndexConstants.SUGGEST_DATA_CHILD_NAME);
         if (!suggStat.hasProperty("lastUpdated")) {
             return null;
         }