Author: chetanm
Date: Mon Nov 7 08:46:23 2016
New Revision: 1768451
URL: http://svn.apache.org/viewvc?rev=1768451&view=rev
Log:
OAK-5075 - Refactor IndexCopier to make it more modular
Simplify indexPath handling
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexCopier.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=1768451&r1=1768450&r2=1768451&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 Nov 7 08:46:23 2016
@@ -122,8 +122,9 @@ 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();
return new CopyOnWriteDirectory(this, remote, local, reindexMode,
- getIndexPathForLogging(definition),
getSharedWorkingSet(definition.getIndexPathFromConfig()), executor);
+ indexPath,
getSharedWorkingSet(definition.getIndexPathFromConfig()), executor);
}
@Override
@@ -234,14 +235,6 @@ public class IndexCopier implements Copy
return workDir;
}
- private static String getIndexPathForLogging(IndexDefinition defn){
- String indexPath = defn.getIndexPathFromConfig();
- if (indexPath == null){
- return "UNKNOWN";
- }
- return indexPath;
- }
-
/**
* Create a unique key based on indexPath and dirName used under that path
*/
