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 ch...@apache.org on 2016/12/05 09:58:36 UTC
svn commit: r1772620 - in /jackrabbit/oak/trunk/oak-lucene/src:
main/java/org/apache/jackrabbit/oak/plugins/index/lucene/
main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/
test/java/org/apache/jackrabbit/oak/plugins/index/lucene/
Author: chetanm
Date: Mon Dec 5 09:58:36 2016
New Revision: 1772620
URL: http://svn.apache.org/viewvc?rev=1772620&view=rev
Log:
OAK-5220 - Remove usage of NodeBuilder in IndexDefinition
Rename getIndexPathFromConfig to getIndexPath as IndexPath is now passed explicitly to IndexDefinition
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexCopier.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LocalIndexWriterFactory.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndex.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndexFactory.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexCopier.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexCopier.java?rev=1772620&r1=1772619&r2=1772620&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexCopier.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexCopier.java Mon Dec 5 09:58:36 2016
@@ -124,7 +124,7 @@ public class IndexCopier implements Copy
public Directory wrapForWrite(IndexDefinition definition, Directory remote, boolean reindexMode, String dirName) throws IOException {
Directory local = createLocalDirForIndexWriter(definition, dirName);
- String indexPath = definition.getIndexPathFromConfig();
+ String indexPath = definition.getIndexPath();
checkIntegrity(indexPath, local, remote);
return new CopyOnWriteDirectory(this, remote, local, reindexMode, indexPath, executor);
}
@@ -147,7 +147,7 @@ public class IndexCopier implements Copy
}
protected Directory createLocalDirForIndexWriter(IndexDefinition definition, String dirName) throws IOException {
- String indexPath = definition.getIndexPathFromConfig();
+ String indexPath = definition.getIndexPath();
File indexWriterDir = getIndexDir(definition, indexPath, dirName);
//By design indexing in Oak is single threaded so Lucene locking
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java?rev=1772620&r1=1772619&r2=1772620&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java Mon Dec 5 09:58:36 2016
@@ -755,7 +755,7 @@ public final class IndexDefinition imple
return spellcheckEnabled;
}
- public String getIndexPathFromConfig() {
+ public String getIndexPath() {
return indexPath;
}
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LocalIndexWriterFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LocalIndexWriterFactory.java?rev=1772620&r1=1772619&r2=1772620&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LocalIndexWriterFactory.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LocalIndexWriterFactory.java Mon Dec 5 09:58:36 2016
@@ -50,7 +50,7 @@ public class LocalIndexWriterFactory imp
@Override
public void updateDocument(String path, Iterable<? extends IndexableField> doc) throws IOException {
- addLuceneDoc(LuceneDoc.forUpdate(definition.getIndexPathFromConfig(), path, doc));
+ addLuceneDoc(LuceneDoc.forUpdate(definition.getIndexPath(), path, doc));
}
@Override
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndex.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndex.java?rev=1772620&r1=1772619&r2=1772620&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndex.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndex.java Mon Dec 5 09:58:36 2016
@@ -151,7 +151,7 @@ public class NRTIndex implements Closeab
@Override
public String toString() {
- return definition.getIndexPathFromConfig();
+ return definition.getIndexPath();
}
//For test
@@ -192,7 +192,7 @@ public class NRTIndex implements Closeab
private synchronized NRTIndexWriter createWriter() throws IOException {
String dirName = generateDirName();
- indexDir = indexCopier.getIndexDir(definition, definition.getIndexPathFromConfig(), dirName);
+ indexDir = indexCopier.getIndexDir(definition, definition.getIndexPath(), dirName);
Directory fsdir = FSDirectory.open(indexDir);
//TODO make these configurable
directory = new NRTCachingDirectory(fsdir, 1, 1);
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndexFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndexFactory.java?rev=1772620&r1=1772619&r2=1772620&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndexFactory.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndexFactory.java Mon Dec 5 09:58:36 2016
@@ -67,7 +67,7 @@ public class NRTIndexFactory implements
if (!(definition.isNRTIndexingEnabled() || definition.isSyncIndexingEnabled())){
return null;
}
- String indexPath = definition.getIndexPathFromConfig();
+ String indexPath = definition.getIndexPath();
NRTIndex current = new NRTIndex(definition, indexCopier, getRefreshPolicy(definition), getPrevious(indexPath));
indexes.put(indexPath, current);
closeLast(indexPath);
Modified: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java?rev=1772620&r1=1772619&r2=1772620&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java Mon Dec 5 09:58:36 2016
@@ -907,7 +907,7 @@ public class LuceneIndexTest {
IndexDefinition defn = new IndexDefinition(root, indexed.getChildNode("oak:index").getChildNode("lucene"), indexPath);
assertEquals(indexPath, defn.getIndexName());
- assertEquals(indexPath, defn.getIndexPathFromConfig());
+ assertEquals(indexPath, defn.getIndexPath());
}