jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thom...@apache.org
Subject svn commit: r1424409 - in /jackrabbit/oak/trunk/oak-core/src: main/java/org/apache/jackrabbit/oak/plugins/index/p2/ main/java/org/apache/jackrabbit/oak/plugins/index/p2/strategy/ test/java/org/apache/jackrabbit/oak/plugins/index/property/ test/resource...
Date Thu, 20 Dec 2012 11:20:46 GMT
Author: thomasm
Date: Thu Dec 20 11:20:46 2012
New Revision: 1424409

URL: http://svn.apache.org/viewvc?rev=1424409&view=rev
Log:
OAK-515 Property2Index should be used for "[indexedProperty] is not null"

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/p2/Property2Index.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/p2/Property2IndexLookup.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/p2/strategy/ContentMirrorStoreStrategy.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/p2/strategy/IndexStoreStrategy.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexQueryTest.java
    jackrabbit/oak/trunk/oak-core/src/test/resources/org/apache/jackrabbit/oak/query/sql2_index.txt

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/p2/Property2Index.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/p2/Property2Index.java?rev=1424409&r1=1424408&r2=1424409&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/p2/Property2Index.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/p2/Property2Index.java
Thu Dec 20 11:20:46 2012
@@ -81,7 +81,8 @@ class Property2Index implements QueryInd
 
     public static final String TYPE = "p2";
 
-    private static final int MAX_STRING_LENGTH = 100; // TODO: configurable
+    // TODO the max string length should be removed, or made configurable
+    private static final int MAX_STRING_LENGTH = 100; 
 
     static List<String> encode(PropertyValue value) {
         List<String> values = new ArrayList<String>();
@@ -110,10 +111,17 @@ class Property2Index implements QueryInd
     public double getCost(Filter filter, NodeState root) {
         Property2IndexLookup lookup = new Property2IndexLookup(root);
         for (PropertyRestriction pr : filter.getPropertyRestrictions()) {
-            if (pr.firstIncluding && pr.lastIncluding
-                    && pr.first.equals(pr.last) // TODO: range queries
-                    && lookup.isIndexed(pr.propertyName, "/")) { // TODO: path
-                return lookup.getCost(pr.propertyName, pr.first);
+            // TODO support indexes on a path
+            // currently, only indexes on the root node are supported
+            if (lookup.isIndexed(pr.propertyName, "/")) {
+                if (pr.firstIncluding && pr.lastIncluding
+                    && pr.first != null && pr.first.equals(pr.last)) {
+                    // "[property] = $value"
+                    return lookup.getCost(pr.propertyName, pr.first);
+                } else if (pr.first == null && pr.last == null) {
+                    // "[property] is not null"
+                    return lookup.getCost(pr.propertyName, null);
+                }
             }
         }
         // not an appropriate index
@@ -126,18 +134,32 @@ class Property2Index implements QueryInd
 
         Property2IndexLookup lookup = new Property2IndexLookup(root);
         for (PropertyRestriction pr : filter.getPropertyRestrictions()) {
-            if (pr.firstIncluding && pr.lastIncluding
-                    && pr.first.equals(pr.last) // TODO: range queries
-                    && lookup.isIndexed(pr.propertyName, "/")) { // TODO: path
-                Set<String> set = lookup.find(pr.propertyName, pr.first);
-                if (paths == null) {
-                    paths = Sets.newHashSet(set);
-                } else {
-                    paths.retainAll(set);
+            // TODO support indexes on a path
+            // currently, only indexes on the root node are supported
+            if (lookup.isIndexed(pr.propertyName, "/")) {
+                Set<String> set = null;
+                // equality
+                if (pr.firstIncluding && pr.lastIncluding
+                    && pr.first != null && pr.first.equals(pr.last)) {
+                    // "[property] = $value"
+                    // TODO don't load all entries in memory
+                    set = lookup.find(pr.propertyName, pr.first);
+                } else if (pr.first == null && pr.last == null) {
+                    // "[property] is not null"
+                    // TODO don't load all entries in memory
+                    set = lookup.find(pr.propertyName, (PropertyValue) null);
+                }
+                // only keep the intersection
+                // TODO this requires all paths are loaded in memory
+                if (set != null) {
+                    if (paths == null) {
+                        paths = Sets.newHashSet(set);
+                    } else {
+                        paths.retainAll(set);
+                    }
                 }
             }
         }
-
         if (paths == null) {
             throw new IllegalStateException("Property index is used even when no index is
available for filter " + filter);
         }
@@ -146,6 +168,7 @@ class Property2Index implements QueryInd
 
     @Override
     public String getPlan(Filter filter, NodeState root) {
-        return "oak:index"; // TODO: better plans
+        // TODO the index should return better query plans
+        return "oak:index"; 
     }
 }
\ No newline at end of file

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/p2/Property2IndexLookup.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/p2/Property2IndexLookup.java?rev=1424409&r1=1424408&r2=1424409&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/p2/Property2IndexLookup.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/p2/Property2IndexLookup.java
Thu Dec 20 11:20:46 2012
@@ -108,7 +108,7 @@ public class Property2IndexLookup {
      * Searches for a given value within this index.
      * 
      * @param name the property name
-     * @param value the property value
+     * @param value the property value (null to check for property existence)
      * @return the set of matched paths
      */
     public Set<String> find(String name, PropertyValue value) {
@@ -117,13 +117,18 @@ public class Property2IndexLookup {
         NodeState state = getIndexDefinitionNode(name);
         if (state != null && state.getChildNode(":index") != null) {
             state = state.getChildNode(":index");
-            paths.addAll(store.find(state, Property2Index.encode(value)));
+            if (value == null) {
+                paths.addAll(store.find(state, null));
+            } else {
+                paths.addAll(store.find(state, Property2Index.encode(value)));
+            }
         } else {
             // No index available, so first check this node for a match
             PropertyState property = root.getProperty(name);
             if (property != null) {
-                if (value.isArray()) {
-                    // let query engine handle multi-valued look ups
+                if (value == null || value.isArray()) {
+                    // let query engine handle property existence and
+                    // multi-valued look ups;
                     // simply return all nodes that have this property
                     paths.add("");
                 } else {
@@ -158,10 +163,16 @@ public class Property2IndexLookup {
 
     public double getCost(String name, PropertyValue value) {
         double cost = 0.0;
+        // TODO the cost method is currently reading all the data - 
+        // is not supposed to do that, it is only supposed to estimate
         NodeState state = getIndexDefinitionNode(name);
         if (state != null && state.getChildNode(":index") != null) {
             state = state.getChildNode(":index");
-            cost += store.count(state, Property2Index.encode(value));
+            if (value == null) {
+                cost += store.count(state, null);
+            } else {
+                cost += store.count(state, Property2Index.encode(value));
+            }
         } else {
             cost = Double.POSITIVE_INFINITY;
         }
@@ -181,7 +192,7 @@ public class Property2IndexLookup {
         if (state != null) {
             for (ChildNodeEntry entry : state.getChildNodeEntries()) {
                 PropertyState type = entry.getNodeState().getProperty(IndexConstants.TYPE_PROPERTY_NAME);
-                if(type == null || type.isArray() || !Property2Index.TYPE.equals(type.getValue(Type.STRING))){
+                if (type == null || type.isArray() || !Property2Index.TYPE.equals(type.getValue(Type.STRING)))
{
                     continue;
                 }
                 PropertyState names = entry.getNodeState().getProperty("propertyNames");

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/p2/strategy/ContentMirrorStoreStrategy.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/p2/strategy/ContentMirrorStoreStrategy.java?rev=1424409&r1=1424408&r2=1424409&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/p2/strategy/ContentMirrorStoreStrategy.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/p2/strategy/ContentMirrorStoreStrategy.java
Thu Dec 20 11:20:46 2012
@@ -31,6 +31,9 @@ import org.apache.jackrabbit.oak.spi.sta
 import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
 import org.apache.jackrabbit.oak.spi.state.NodeState;
 
+/**
+ * TODO document
+ */
 public class ContentMirrorStoreStrategy implements IndexStoreStrategy {
 
     @Override
@@ -86,7 +89,7 @@ public class ContentMirrorStoreStrategy 
         }
     }
 
-    private void pruneNode(NodeBuilder parent) {
+    private static void pruneNode(NodeBuilder parent) {
         if (parent.isRemoved()) {
             return;
         }
@@ -106,7 +109,7 @@ public class ContentMirrorStoreStrategy 
 
         for (String add : values) {
             NodeBuilder indexEntry = child;
-            for(String segment: PathUtils.elements(add)){
+            for (String segment : PathUtils.elements(add)) {
                 indexEntry = indexEntry.child(segment);
             }
             indexEntry.setProperty("match", true);
@@ -136,11 +139,20 @@ public class ContentMirrorStoreStrategy 
     @Override
     public Set<String> find(NodeState index, Iterable<String> values) {
         Set<String> paths = new HashSet<String>();
-        for (String p : values) {
-            NodeState property = index.getChildNode(p);
-            if (property != null) {
+        if (values == null) {
+            if (index != null) {
                 // We have an entry for this value, so use it
-                getMatchingPaths(property, "", paths);
+                for (ChildNodeEntry child : index.getChildNodeEntries()) {
+                    getMatchingPaths(child.getNodeState(), "", paths);
+                }
+            }
+        } else {
+            for (String p : values) {
+                NodeState property = index.getChildNode(p);
+                if (property != null) {
+                    // We have an entry for this value, so use it
+                    getMatchingPaths(property, "", paths);
+                }
             }
         }
         return paths;
@@ -162,8 +174,12 @@ public class ContentMirrorStoreStrategy 
     @Override
     public int count(NodeState index, Iterable<String> values) {
         int count = 0;
-        for (String p : values) {
-            count += countMatchingLeaves(index.getChildNode(p));
+        if (values == null) {
+            count += countMatchingLeaves(index);
+        } else {
+            for (String p : values) {
+                count += countMatchingLeaves(index.getChildNode(p));
+            }
         }
         return count;
     }

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/p2/strategy/IndexStoreStrategy.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/p2/strategy/IndexStoreStrategy.java?rev=1424409&r1=1424408&r2=1424409&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/p2/strategy/IndexStoreStrategy.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/p2/strategy/IndexStoreStrategy.java
Thu Dec 20 11:20:46 2012
@@ -25,7 +25,6 @@ import org.apache.jackrabbit.oak.spi.sta
 /**
  * Strategy that defines how the index content will be actually stored under the
  * index node
- * 
  */
 public interface IndexStoreStrategy {
 
@@ -57,16 +56,17 @@ public interface IndexStoreStrategy {
      * Search for a given set of values
      * 
      * @param index index node
-     * @param values values to look for
+     * @param values values to look for (null to check for property existence)
      * @return the set of paths corresponding to the given values
      */
     Set<String> find(NodeState index, Iterable<String> values);
 
     /**
-     * Count the occurrence of a given set of values. Used in scoring.
+     * Count the occurrence of a given set of values. Used in calculating the
+     * cost of an index.
      * 
      * @param index the index node
-     * @param values values to look for
+     * @param values values to look for (null to check for property existence)
      * @return the aggregated count of occurrences for each provided value
      */
     int count(NodeState index, Iterable<String> values);

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexQueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexQueryTest.java?rev=1424409&r1=1424408&r2=1424409&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexQueryTest.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexQueryTest.java
Thu Dec 20 11:20:46 2012
@@ -28,6 +28,7 @@ import org.apache.jackrabbit.oak.api.Tre
 import org.apache.jackrabbit.oak.api.Type;
 import org.apache.jackrabbit.oak.plugins.nodetype.InitialContent;
 import org.apache.jackrabbit.oak.query.AbstractQueryTest;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
@@ -60,6 +61,8 @@ public class PropertyIndexQueryTest exte
     }
 
     @Test
+    @Ignore
+    // not implemented, see OAK-515
     public void sql2Index() throws Exception {
         test("sql2_index.txt");
     }

Modified: jackrabbit/oak/trunk/oak-core/src/test/resources/org/apache/jackrabbit/oak/query/sql2_index.txt
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/resources/org/apache/jackrabbit/oak/query/sql2_index.txt?rev=1424409&r1=1424408&r2=1424409&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/resources/org/apache/jackrabbit/oak/query/sql2_index.txt
(original)
+++ jackrabbit/oak/trunk/oak-core/src/test/resources/org/apache/jackrabbit/oak/query/sql2_index.txt
Thu Dec 20 11:20:46 2012
@@ -28,7 +28,16 @@
 explain select * from [nt:base] where [jcr:uuid] = '123'
 [nt:base] as [nt:base] /* oak:index where [nt:base].[jcr:uuid] = cast('123' as string) */
 
-select * from [nt:base] where [jcr:uuid] = '123'
-
 explain select * from [nt:base] where [jcr:uuid] is not null
-[nt:base] as [nt:base] /* traverse "//*" where [nt:base].[jcr:uuid] is not null */
+[nt:base] as [nt:base] /* oak:index where [nt:base].[jcr:uuid] is not null */
+
+commit / + "test": { "jcr:uuid": "xyz", "a": { "jcr:uuid": "123" } }
+
+select * from [nt:base] where [jcr:uuid] is not null
+/test
+/test/a
+
+select * from [nt:base] where [jcr:uuid] = 'xyz'
+/test
+
+commit / - "test"



Mime
View raw message