Author: alexparvulescu Date: Thu Jun 13 08:34:08 2013 New Revision: 1492564
URL: http://svn.apache.org/r1492564 Log: OAK-831 Lucene filesystem based index - fixed a bug that prevented the lucene index from being used in queries when persistence is file based Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexConstants.java Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java?rev=1492564&r1=1492563&r2=1492564&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java (original) +++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java Thu Jun 13 08:34:08 2013 @@ -24,7 +24,7 @@ import static org.apache.jackrabbit.oak. import static org.apache.jackrabbit.oak.plugins.index.lucene.FieldNames.PATH; import static org.apache.jackrabbit.oak.plugins.index.lucene.FieldNames.PATH_SELECTOR; import static org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.INDEX_DATA_CHILD_NAME; -import static org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.INDEX_PATH; +import static org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.PERSISTENCE_PATH; import static org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.PERSISTENCE_FILE; import static org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.PERSISTENCE_NAME; import static org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.PERSISTENCE_OAK; @@ -147,7 +147,7 @@ public class LuceneIndex implements Full } if (PERSISTENCE_FILE.equalsIgnoreCase(type)) { - return getString(def, INDEX_PATH) != null; + return getString(def, PERSISTENCE_PATH) != null; } return false; @@ -169,7 +169,7 @@ public class LuceneIndex implements Full } if (PERSISTENCE_FILE.equalsIgnoreCase(type)) { - String fs = getString(def, INDEX_PATH); + String fs = getString(def, PERSISTENCE_PATH); if (fs == null) { return null; } 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=1492564&r1=1492563&r2=1492564&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 Thu Jun 13 08:34:08 2013 @@ -26,7 +26,7 @@ public interface LuceneIndexConstants { String INDEX_DATA_CHILD_NAME = ":data"; - Version VERSION = Version.LUCENE_42; + Version VERSION = Version.LUCENE_43; Analyzer ANALYZER = new StandardAnalyzer(VERSION); @@ -45,6 +45,4 @@ public interface LuceneIndexConstants { String INDEX_DATA_CHILD_NAME_FS = "data"; - String INDEX_PATH = "index"; - }
