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/26 14:12:52 UTC
svn commit: r1697896 - in /jackrabbit/oak/trunk:
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/aggregate/
oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/
oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/ oak-cor...
Author: thomasm
Date: Wed Aug 26 12:12:52 2015
New Revision: 1697896
URL: http://svn.apache.org/r1697896
Log:
OAK-3230 Query engine should support virtual index rows
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/aggregate/AggregationCursor.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/SelectorImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/IndexRowImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/IndexRow.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/package-info.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/query/CursorsTest.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/aggregate/AggregationCursor.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/aggregate/AggregationCursor.java?rev=1697896&r1=1697895&r2=1697896&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/aggregate/AggregationCursor.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/aggregate/AggregationCursor.java Wed Aug 26 12:12:52 2015
@@ -88,11 +88,13 @@ class AggregationCursor extends Abstract
aggregates = null;
if (cursor.hasNext()) {
currentRow = cursor.next();
- String path = currentRow.getPath();
- aggregates = Iterators.filter(Iterators.concat(
- Iterators.singletonIterator(path),
- aggregator.getParents(rootState, path)), Predicates
- .not(Predicates.in(seenPaths)));
+ if (!currentRow.isVirtualRow()) {
+ String path = currentRow.getPath();
+ aggregates = Iterators.filter(Iterators.concat(
+ Iterators.singletonIterator(path),
+ aggregator.getParents(rootState, path)), Predicates
+ .not(Predicates.in(seenPaths)));
+ }
fetchNext();
return;
}
@@ -115,6 +117,11 @@ class AggregationCursor extends Abstract
return new IndexRow() {
@Override
+ public boolean isVirtualRow() {
+ return false;
+ }
+
+ @Override
public String getPath() {
return currentPath;
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/SelectorImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/SelectorImpl.java?rev=1697896&r1=1697895&r2=1697896&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/SelectorImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/SelectorImpl.java Wed Aug 26 12:12:52 2015
@@ -412,6 +412,9 @@ public class SelectorImpl extends Source
// where [b].[jcr:path] = $path"
// because if we did, we would filter out
// correct results
+ } else if (currentRow.isVirtualRow()) {
+ // this is a virtual row and should be selected as is
+ return true;
} else {
// we must check whether the _child_ is readable
// (even if no properties are read) for joins of type
@@ -437,6 +440,10 @@ public class SelectorImpl extends Source
}
private boolean evaluateCurrentRow() {
+ if (currentRow.isVirtualRow()) {
+ //null path implies that all checks are already done -- we just need to pass it through
+ return true;
+ }
if (!matchesAllTypes && !evaluateTypeMatch()) {
return false;
}
@@ -620,7 +627,7 @@ public class SelectorImpl extends Source
private PropertyValue currentOakProperty(Tree t, String oakPropertyName, Integer propertyType) {
PropertyValue result;
- if (t == null || !t.exists()) {
+ if ((t == null || !t.exists()) && (currentRow == null || !currentRow.isVirtualRow())) {
return null;
}
if (oakPropertyName.equals(QueryImpl.JCR_PATH)) {
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/IndexRowImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/IndexRowImpl.java?rev=1697896&r1=1697895&r2=1697896&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/IndexRowImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/IndexRowImpl.java Wed Aug 26 12:12:52 2015
@@ -33,6 +33,11 @@ public class IndexRowImpl implements Ind
}
@Override
+ public boolean isVirtualRow() {
+ return false;
+ }
+
+ @Override
public String getPath() {
return path;
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/IndexRow.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/IndexRow.java?rev=1697896&r1=1697895&r2=1697896&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/IndexRow.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/IndexRow.java Wed Aug 26 12:12:52 2015
@@ -24,6 +24,13 @@ import org.apache.jackrabbit.oak.api.Pro
* A row returned by the index.
*/
public interface IndexRow {
+ /**
+ * Marks if the row is virtual and behavior of {@code getPath} is undefined. The implementation may
+ * choose to return {@code null} or empty string. User of a virtual row should now rely of value of
+ * {@code getPath} returned from virtual rows.
+ * @return if path is available for the current row
+ */
+ boolean isVirtualRow();
/**
* The path of the node, if available.
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/package-info.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/package-info.java?rev=1697896&r1=1697895&r2=1697896&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/package-info.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/package-info.java Wed Aug 26 12:12:52 2015
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-@Version("2.2.0")
+@Version("3.0.0")
@Export(optional = "provide:=true")
package org.apache.jackrabbit.oak.spi.query;
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/query/CursorsTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/query/CursorsTest.java?rev=1697896&r1=1697895&r2=1697896&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/query/CursorsTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/query/CursorsTest.java Wed Aug 26 12:12:52 2015
@@ -119,6 +119,11 @@ public class CursorsTest {
}
@Override
+ public boolean isVirtualRow() {
+ return false;
+ }
+
+ @Override
public String getPath() {
return path;
}
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java?rev=1697896&r1=1697895&r2=1697896&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java Wed Aug 26 12:12:52 2015
@@ -1110,6 +1110,11 @@ public class LuceneIndex implements Adva
return new IndexRow() {
@Override
+ public boolean isVirtualRow() {
+ return getPath() == null;
+ }
+
+ @Override
public String getPath() {
return pathRow.getPath();
}
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java?rev=1697896&r1=1697895&r2=1697896&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java Wed Aug 26 12:12:52 2015
@@ -1245,6 +1245,11 @@ public class LucenePropertyIndex impleme
return new IndexRow() {
@Override
+ public boolean isVirtualRow() {
+ return getPath() == null;
+ }
+
+ @Override
public String getPath() {
String sub = pathRow.getPath();
if (PathUtils.isAbsolute(sub)) {
Modified: jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java?rev=1697896&r1=1697895&r2=1697896&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java (original)
+++ jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java Wed Aug 26 12:12:52 2015
@@ -541,6 +541,11 @@ public class SolrQueryIndex implements F
return new IndexRow() {
@Override
+ public boolean isVirtualRow() {
+ return false;
+ }
+
+ @Override
public String getPath() {
return pathRow.getPath();
}