svn commit: r1772624 - in /jackrabbit/oak/trunk/oak-core/src: main/java/org/apache/jackrabbit/oak/plugins/index/ test/java/org/apache/jackrabbit/oak/plugins/index/property/

[chetanm]

Author: chetanm
Date: Mon Dec  5 10:26:36 2016
New Revision: 1772624

URL: http://svn.apache.org/viewvc?rev=1772624&view=rev
Log:
OAK-5221 - Do not set :indexPath in index definition node

Remove the :indexPath support

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/property/PropertyIndexTest.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=1772624&r1=1772623&r2=1772624&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
 Mon Dec  5 10:26:36 2016
@@ -73,12 +73,6 @@ public interface IndexConstants {
     String QUERY_PATHS = "queryPaths";
 
     /**
-     * Hidden property which stores the indexPath which can be used by
-     * IndexEditors
-     */
-    String INDEX_PATH = ":indexPath";
-
-    /**
      * Property name for indicating that given index is corrupt and should be 
excluded
      * from further indexing. Its value is the date when this index was marked 
as
      * corrupt

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=1772624&r1=1772623&r2=1772624&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
 Mon Dec  5 10:26:36 2016
@@ -27,7 +27,6 @@ import static org.apache.jackrabbit.oak.
 import static 
org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEXING_MODE_NRT;
 import static 
org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEXING_MODE_SYNC;
 import static 
org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEX_DEFINITIONS_NAME;
-import static 
org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEX_PATH;
 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;
@@ -233,8 +232,6 @@ public class IndexUpdate implements Edit
                     continue;
                 }
 
-                manageIndexPath(definition, name);
-
                 Editor editor = rootState.provider.getIndexEditor(type, 
definition, rootState.root,
                         rootState.newCallback(indexPath, shouldReindex));
                 if (editor == null) {
@@ -281,13 +278,6 @@ public class IndexUpdate implements Edit
         }
     }
 
-    private void manageIndexPath(NodeBuilder definition, String name) {
-        String path = definition.getString(INDEX_PATH);
-        if (path == null){
-            definition.setProperty(INDEX_PATH, PathUtils.concat(getPath(), 
INDEX_DEFINITIONS_NAME, name));
-        }
-    }
-
     private void incrementReIndexCount(NodeBuilder definition) {
         long count = 0;
         if(definition.hasProperty(REINDEX_COUNT)){

Modified: 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexTest.java?rev=1772624&r1=1772623&r2=1772624&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexTest.java
 Mon Dec  5 10:26:36 2016
@@ -23,7 +23,6 @@ import static org.apache.jackrabbit.JcrC
 import static org.apache.jackrabbit.JcrConstants.NT_UNSTRUCTURED;
 import static 
org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEX_CONTENT_NODE_NAME;
 import static 
org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEX_DEFINITIONS_NAME;
-import static 
org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEX_PATH;
 import static 
org.apache.jackrabbit.oak.plugins.index.IndexUtils.createIndexDefinition;
 import static 
org.apache.jackrabbit.oak.plugins.index.PathFilter.PROP_EXCLUDED_PATHS;
 import static 
org.apache.jackrabbit.oak.plugins.index.PathFilter.PROP_INCLUDED_PATHS;
@@ -738,20 +737,6 @@ public class PropertyIndexTest {
     }
 
     @Test
-    public void indexPath() throws Exception{
-        NodeState root = INITIAL_CONTENT;
-
-        // Add index definition
-        NodeBuilder builder = root.builder();
-        createIndexDefinition(builder.child(INDEX_DEFINITIONS_NAME), "foo",
-                true, false, ImmutableSet.of("foo"), null);
-        NodeState after = builder.getNodeState();
-        NodeState indexed = HOOK.processCommit(root, after, CommitInfo.EMPTY);
-        NodeState idxDefn = NodeStateUtils.getNode(indexed, "/oak:index/foo");
-        assertEquals("/oak:index/foo", idxDefn.getString(INDEX_PATH));
-    }
-
-    @Test
     public void singleMount() throws Exception {
         NodeState root = INITIAL_CONTENT;