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 2014/10/28 06:36:04 UTC
svn commit: r1634779 - in /jackrabbit/oak/trunk/oak-core/src:
main/java/org/apache/jackrabbit/oak/plugins/index/
test/java/org/apache/jackrabbit/oak/plugins/index/
Author: chetanm
Date: Tue Oct 28 05:36:04 2014
New Revision: 1634779
URL: http://svn.apache.org/r1634779
Log:
OAK-2229 - Provide a way for Index implementation to determine reindex modee
When reindex would be done IndexUpdate would increment 'reindexCount' in the index definition node. Index implementation can use that to determine the index generation/revision
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexConstants.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdate.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdateTest.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexConstants.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexConstants.java?rev=1634779&r1=1634778&r2=1634779&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexConstants.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexConstants.java Tue Oct 28 05:36:04 2014
@@ -31,6 +31,8 @@ public interface IndexConstants {
String REINDEX_PROPERTY_NAME = "reindex";
+ String REINDEX_COUNT = "reindexCount";
+
String REINDEX_ASYNC_PROPERTY_NAME = "reindex-async";
String ASYNC_PROPERTY_NAME = "async";
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdate.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdate.java?rev=1634779&r1=1634778&r2=1634779&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdate.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdate.java Tue Oct 28 05:36:04 2014
@@ -25,6 +25,7 @@ import static org.apache.jackrabbit.oak.
import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.ASYNC_REINDEX_VALUE;
import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEX_DEFINITIONS_NAME;
import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.REINDEX_ASYNC_PROPERTY_NAME;
+import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.REINDEX_COUNT;
import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.REINDEX_PROPERTY_NAME;
import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.TYPE_PROPERTY_NAME;
import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.MISSING_NODE;
@@ -42,6 +43,7 @@ import javax.annotation.Nonnull;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.PropertyState;
+import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.spi.commit.Editor;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
@@ -174,6 +176,7 @@ public class IndexUpdate implements Edit
ASYNC_REINDEX_VALUE);
} else {
definition.setProperty(REINDEX_PROPERTY_NAME, false);
+ incrementReIndexCount(definition);
// as we don't know the index content node name
// beforehand, we'll remove all child nodes
for (String rm : definition.getChildNodeNames()) {
@@ -190,6 +193,14 @@ public class IndexUpdate implements Edit
}
}
+ private void incrementReIndexCount(NodeBuilder definition) {
+ long count = 0;
+ if(definition.hasProperty(REINDEX_COUNT)){
+ count = definition.getProperty(REINDEX_COUNT).getValue(Type.LONG);
+ }
+ definition.setProperty(REINDEX_COUNT, count + 1);
+ }
+
/**
* Returns the path of this node, building it lazily when first requested.
*/
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdateTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdateTest.java?rev=1634779&r1=1634778&r2=1634779&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdateTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdateTest.java Tue Oct 28 05:36:04 2014
@@ -388,6 +388,34 @@ public class IndexUpdateTest {
azerty.getProperty(REINDEX_PROPERTY_NAME));
}
+ @Test
+ public void testReindexCount() throws Exception{
+ builder.child("testRoot").setProperty("foo", "abc");
+ NodeState before = builder.getNodeState();
+
+ createIndexDefinition(builder.child(INDEX_DEFINITIONS_NAME),
+ "rootIndex", false, false, ImmutableSet.of("foo"), null);
+
+ NodeState after = builder.getNodeState();
+
+ NodeState indexed = HOOK.processCommit(before, after, CommitInfo.EMPTY);
+ long t1 = getReindexCount(indexed);
+
+ NodeBuilder b2 = indexed.builder();
+ b2.child(INDEX_DEFINITIONS_NAME).child("rootIndex").setProperty(IndexConstants.REINDEX_PROPERTY_NAME, true);
+ indexed = HOOK.processCommit(indexed, b2.getNodeState(), CommitInfo.EMPTY);
+ long t2 = getReindexCount(indexed);
+
+ assertTrue(t2 > t1);
+ }
+
+
+ long getReindexCount(NodeState indexed) {
+ return indexed.getChildNode(INDEX_DEFINITIONS_NAME)
+ .getChildNode("rootIndex")
+ .getProperty(IndexConstants.REINDEX_COUNT).getValue(Type.LONG);
+ }
+
private static IndexEditorProvider emptyProvider() {
return new IndexEditorProvider() {
@Override
@@ -419,4 +447,6 @@ public class IndexUpdateTest {
return c;
}
+
+
}