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 10:26:24 UTC
svn commit: r1772623 - 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/
test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/
Author: chetanm
Date: Mon Dec 5 10:26:24 2016
New Revision: 1772623
URL: http://svn.apache.org/viewvc?rev=1772623&view=rev
Log:
OAK-5221 - Do not set :indexPath in index definition node
Remove usage of :indexPath from oak-lucene
Modified:
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/LuceneIndexEditorContext.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexCopierTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/OakDirectoryTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndexFactoryTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndexTest.java
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=1772623&r1=1772622&r2=1772623&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 10:26:24 2016
@@ -1257,6 +1257,10 @@ public final class IndexDefinition imple
//~---------------------------------------------< compatibility >
public static NodeBuilder updateDefinition(NodeBuilder indexDefn){
+ return updateDefinition(indexDefn, "unknown");
+ }
+
+ public static NodeBuilder updateDefinition(NodeBuilder indexDefn, String indexPath){
NodeState defn = indexDefn.getBaseState();
if (!hasIndexingRules(defn)){
NodeState rulesState = createIndexRules(defn).getNodeState();
@@ -1269,7 +1273,7 @@ public final class IndexDefinition imple
indexDefn.removeProperty(ORDERED_PROP_NAMES);
indexDefn.removeProperty(FULL_TEXT_ENABLED);
indexDefn.child(PROP_NODE).remove();
- log.info("Updated index definition for {}", indexDefn.getString(INDEX_PATH));
+ log.info("Updated index definition for {}", indexPath);
}
return indexDefn;
}
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=1772623&r1=1772622&r2=1772623&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 Mon Dec 5 10:26:24 2016
@@ -118,7 +118,7 @@ public class LuceneIndexEditorContext {
this.augmentorFactory = augmentorFactory;
this.asyncIndexing = asyncIndexing;
if (this.definition.isOfOldFormat()){
- IndexDefinition.updateDefinition(definition);
+ IndexDefinition.updateDefinition(definition, indexingContext.getIndexPath());
}
}
Modified: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexCopierTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexCopierTest.java?rev=1772623&r1=1772622&r2=1772623&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexCopierTest.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexCopierTest.java Mon Dec 5 10:26:24 2016
@@ -97,7 +97,6 @@ public class IndexCopierTest {
@Before
public void setUp(){
- builder.setProperty(IndexConstants.INDEX_PATH, indexPath);
LuceneIndexEditorContext.configureUniqueId(builder);
}
@@ -594,7 +593,6 @@ public class IndexCopierTest {
IndexCopier copier = new IndexCopier(sameThreadExecutor(), getWorkDir());
- builder.setProperty(IndexConstants.INDEX_PATH, "foo");
IndexDefinition defn = new IndexDefinition(root, builder.getNodeState(), "/foo");
Directory dir = copier.wrapForWrite(defn, remote, false, INDEX_DATA_CHILD_NAME);
@@ -972,9 +970,7 @@ public class IndexCopierTest {
executor.setForwardingExecutor(executorService);
Directory baseDir = new CloseSafeDir();
- String indexPath = "/foo";
- builder.setProperty(IndexConstants.INDEX_PATH, indexPath);
- IndexDefinition defn = new IndexDefinition(root, builder.getNodeState(), "/foo");
+ IndexDefinition defn = new IndexDefinition(root, builder.getNodeState(), indexPath);
IndexCopier copier = new RAMIndexCopier(baseDir, executor, getWorkDir(), true);
Directory remote = new CloseSafeDir();
Modified: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorTest.java?rev=1772623&r1=1772622&r2=1772623&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorTest.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorTest.java Mon Dec 5 10:26:24 2016
@@ -417,7 +417,6 @@ public class LuceneIndexEditorTest {
NodeBuilder index = builder.child(INDEX_DEFINITIONS_NAME);
NodeBuilder nb = newLuceneIndexDefinitionV2(index, "lucene", of(TYPENAME_STRING));
- nb.setProperty(IndexConstants.INDEX_PATH, "foo");
IndexUtils.createIndexDefinition(index, "failingIndex", false, false, of("foo"), null);
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=1772623&r1=1772622&r2=1772623&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 10:26:24 2016
@@ -911,28 +911,6 @@ public class LuceneIndexTest {
}
- @Test
- public void luceneWithCopyOnReadDir_Compat() throws Exception{
- NodeBuilder index = builder.child(INDEX_DEFINITIONS_NAME);
- newLucenePropertyIndexDefinition(index, "lucene", ImmutableSet.of("foo", "foo2"), null);
-
- NodeState before = builder.getNodeState();
- builder.setProperty("foo", "bar");
- NodeState after = builder.getNodeState();
-
- NodeState indexed = HOOK.processCommit(before, after,CommitInfo.EMPTY);
-
- builder = indexed.builder();
- builder.getChildNode("oak:index").getChildNode("lucene").removeProperty(IndexConstants.INDEX_PATH);
- indexed = builder.getNodeState();
-
- File indexRootDir = new File(getIndexDir());
- tracker = new IndexTracker(new IndexCopier(sameThreadExecutor(), indexRootDir));
- tracker.update(indexed);
-
- assertQuery(tracker, indexed, "foo", "bar");
- }
-
@After
public void cleanUp(){
if (tracker != null) {
Modified: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/OakDirectoryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/OakDirectoryTest.java?rev=1772623&r1=1772622&r2=1772623&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/OakDirectoryTest.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/OakDirectoryTest.java Mon Dec 5 10:26:24 2016
@@ -356,7 +356,6 @@ public class OakDirectoryTest {
@Test
public void dirNameInExceptionMessage() throws Exception{
String indexPath = "/foo/bar";
- builder.setProperty(IndexConstants.INDEX_PATH, indexPath);
Directory dir = createDir(builder, false, indexPath);
try {
@@ -402,7 +401,6 @@ public class OakDirectoryTest {
int blobSize = minFileSize + 1000;
builder = nodeStore.getRoot().builder();
- builder.setProperty(IndexConstants.INDEX_PATH, indexPath);
builder.setProperty(LuceneIndexConstants.BLOB_SIZE, blobSize);
Directory dir = createDir(builder, false, indexPath);
Modified: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndexFactoryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndexFactoryTest.java?rev=1772623&r1=1772622&r2=1772623&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndexFactoryTest.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndexFactoryTest.java Mon Dec 5 10:26:24 2016
@@ -130,9 +130,8 @@ public class NRTIndexFactoryTest {
}
private IndexDefinition getIndexDefinition(String indexPath, IndexingMode indexingMode) {
- builder.setProperty(IndexConstants.INDEX_PATH, indexPath);
TestUtil.enableIndexingMode(builder, indexingMode);
- return new IndexDefinition(root, builder.getNodeState(), "/foo");
+ return new IndexDefinition(root, builder.getNodeState(), indexPath);
}
}
\ No newline at end of file
Modified: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndexTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndexTest.java?rev=1772623&r1=1772622&r2=1772623&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndexTest.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndexTest.java Mon Dec 5 10:26:24 2016
@@ -192,10 +192,9 @@ public class NRTIndexTest {
}
private IndexDefinition getSyncIndexDefinition(String indexPath) {
- builder.setProperty(IndexConstants.INDEX_PATH, indexPath);
TestUtil.enableIndexingMode(builder, IndexingMode.NRT);
- return new IndexDefinition(root, builder.getNodeState(), "/foo");
+ return new IndexDefinition(root, builder.getNodeState(), indexPath);
}