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 th...@apache.org on 2015/08/14 14:58:10 UTC
svn commit: r1695886 - in
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/diffindex:
BaseDiffCollector.java DiffCollector.java DiffIndex.java
UUIDDiffCollector.java
Author: thomasm
Date: Fri Aug 14 12:58:10 2015
New Revision: 1695886
URL: http://svn.apache.org/r1695886
Log:
OAK-3227 The DiffIndex relies on implementation details
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/diffindex/BaseDiffCollector.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/diffindex/DiffCollector.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/diffindex/DiffIndex.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/diffindex/UUIDDiffCollector.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/diffindex/BaseDiffCollector.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/diffindex/BaseDiffCollector.java?rev=1695886&r1=1695885&r2=1695886&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/diffindex/BaseDiffCollector.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/diffindex/BaseDiffCollector.java Fri Aug 14 12:58:10 2015
@@ -29,11 +29,17 @@ import org.apache.jackrabbit.oak.spi.sta
public abstract class BaseDiffCollector implements DiffCollector {
+ protected boolean init;
+
private final NodeState before;
private final NodeState after;
private Set<String> results;
- protected boolean init = false;
+
+ /**
+ * The filter that was used to generate the result.
+ */
+ private Filter resultFilter;
/**
* @param before initial state
@@ -45,6 +51,7 @@ public abstract class BaseDiffCollector
results = new HashSet<String>();
}
+ @Override
public Set<String> getResults(Filter filter) {
if (!init) {
collect(filter);
@@ -52,15 +59,15 @@ public abstract class BaseDiffCollector
return results;
}
+ @Override
public double getCost(Filter filter) {
- if (!init) {
+ if (!init || filter != resultFilter) {
collect(filter);
}
if (results.isEmpty()) {
return Double.POSITIVE_INFINITY;
}
-
- // TODO probably the number of read nodes during the diff
+ // no read operations needed
return 0;
}
@@ -69,6 +76,7 @@ public abstract class BaseDiffCollector
filter);
after.compareAgainstBaseState(before, diff);
this.results = new HashSet<String>(diff.getResults());
+ this.resultFilter = filter;
this.init = true;
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/diffindex/DiffCollector.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/diffindex/DiffCollector.java?rev=1695886&r1=1695885&r2=1695886&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/diffindex/DiffCollector.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/diffindex/DiffCollector.java Fri Aug 14 12:58:10 2015
@@ -27,8 +27,21 @@ import org.apache.jackrabbit.oak.spi.que
*/
public interface DiffCollector {
- Set<String> getResults(Filter filter);
-
+ /**
+ * Get the cost for the given filter, and prepare the result if the index
+ * can be used.
+ *
+ * @param filter the filter
+ * @return the cost
+ */
double getCost(Filter filter);
+ /**
+ * Get the result for this filter.
+ *
+ * @param filter the filter
+ * @return the result
+ */
+ Set<String> getResults(Filter filter);
+
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/diffindex/DiffIndex.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/diffindex/DiffIndex.java?rev=1695886&r1=1695885&r2=1695886&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/diffindex/DiffIndex.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/diffindex/DiffIndex.java Fri Aug 14 12:58:10 2015
@@ -46,7 +46,6 @@ public abstract class DiffIndex implemen
@Override
public String getPlan(Filter filter, NodeState rootState) {
- // //TODO ?
- return null;
+ return "diffIndex " + filter.toString();
}
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/diffindex/UUIDDiffCollector.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/diffindex/UUIDDiffCollector.java?rev=1695886&r1=1695885&r2=1695886&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/diffindex/UUIDDiffCollector.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/diffindex/UUIDDiffCollector.java Fri Aug 14 12:58:10 2015
@@ -16,6 +16,8 @@
*/
package org.apache.jackrabbit.oak.plugins.index.diffindex;
+import java.util.Set;
+
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.spi.query.Filter;
@@ -27,14 +29,14 @@ import org.apache.jackrabbit.oak.spi.sta
*/
public class UUIDDiffCollector extends BaseDiffCollector {
- private String uuid = null;
+ private String uuid;
public UUIDDiffCollector(NodeState before, NodeState after) {
super(before, after);
}
@Override
- public void collect(final Filter filter) {
+ public void collect(Filter filter) {
uuid = null;
Filter.PropertyRestriction restriction = filter
.getPropertyRestriction("jcr:uuid");
@@ -47,6 +49,20 @@ public class UUIDDiffCollector extends B
uuid = restriction.first.toString();
super.collect(filter);
}
+
+ private static String extractUuidFromFilter(Filter filter) {
+ Filter.PropertyRestriction restriction = filter
+ .getPropertyRestriction("jcr:uuid");
+ return restriction.first.toString();
+ }
+
+ @Override
+ public Set<String> getResults(Filter filter) {
+ if (init && !extractUuidFromFilter(filter).equals(uuid)) {
+ throw new IllegalArgumentException("UUID does not match ");
+ }
+ return super.getResults(filter);
+ }
@Override
protected boolean match(NodeState state, Filter filter) {