svn commit: r1641596 - 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/

[ch...@apache.org]

Author: chetanm
Date: Tue Nov 25 11:55:50 2014
New Revision: 1641596

URL: http://svn.apache.org/r1641596
Log:
OAK-2272 - Compatibility support for pre index rule configuration

Ensure that regular expression used to allow inclusion of all properties does not allow relative properties. Otherwise such a definition would allow planner to return plan for relative property restrictions like [../foo] which LucenePropertyIndex does not support

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/LuceneIndexConstants.java
    jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinitionTest.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=1641596&r1=1641595&r2=1641596&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 Tue Nov 25 11:55:50 2014
@@ -752,7 +752,7 @@ class IndexDefinition {
 
         List<String> propNames = new ArrayList<String>(propNamesSet);
 
-        final String includeAllProp = ".*";
+        final String includeAllProp = LuceneIndexConstants.REGEX_ALL_PROPS;
         if (fullTextEnabled
                 && includes.isEmpty()){
             //Add the regEx for including all properties at the end

Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexConstants.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexConstants.java?rev=1641596&r1=1641595&r2=1641596&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexConstants.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexConstants.java Tue Nov 25 11:55:50 2014
@@ -149,4 +149,9 @@ public interface LuceneIndexConstants {
      * should be sufficient
      */
     String PROP_INCLUDED_TYPE = "oak.experimental.includePropertyTypes";
+
+    /**
+     * Regex to allow inclusion of all immediate properties of the node
+     */
+    String REGEX_ALL_PROPS = "^[^\\/]*$";
 }

Modified: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinitionTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinitionTest.java?rev=1641596&r1=1641595&r2=1641596&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinitionTest.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinitionTest.java Tue Nov 25 11:55:50 2014
@@ -392,6 +392,21 @@ public class IndexDefinitionTest {
         assertFalse(rule.getConfig("foo").index);
     }
 
+    @Test
+    public void propertyRegExAndRelativeProperty() throws Exception{
+        NodeBuilder defnb = newLuceneIndexDefinition(builder.child(INDEX_DEFINITIONS_NAME),
+                "lucene", of(TYPENAME_STRING), of("foo"), "async");
+        IndexDefinition defn = new IndexDefinition(root, defnb.getNodeState());
+        assertTrue(defn.isOfOldFormat());
+
+        NodeBuilder updated = IndexDefinition.updateDefinition(defnb.getNodeState().builder());
+        IndexDefinition defn2 = new IndexDefinition(root, updated.getNodeState());
+
+        IndexingRule rule = defn2.getApplicableIndexingRule(newTree(newNode("nt:base")));
+        assertNotNull(rule.getConfig("foo"));
+        assertNull("Property regex used should not allow relative properties", rule.getConfig("foo/bar"));
+    }
+
 
     private static IndexingRule getRule(IndexDefinition defn, String typeName){
         return defn.getApplicableIndexingRule(newTree(newNode(typeName)));