Author: thomasm
Date: Wed Sep 4 09:51:30 2013
New Revision: 1519961
URL: http://svn.apache.org/r1519961
Log:
OAK-828 Full-text support for index aggregates (do support for property
existence restrictions for relative properties, but use the correct property
name)
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/FullTextSearchImpl.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/FullTextSearchImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/FullTextSearchImpl.java?rev=1519961&r1=1519960&r2=1519961&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/FullTextSearchImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/FullTextSearchImpl.java
Wed Sep 4 09:51:30 2013
@@ -139,12 +139,13 @@ public class FullTextSearchImpl extends
if (propertyName == null) {
return Collections.emptySet();
}
- // makes no sense in applying a property existence constrain when that
- // property is on a different node
+ String fullName;
if (relativePath != null) {
- return Collections.emptySet();
+ fullName = PathUtils.concat(relativePath, propertyName);
+ } else {
+ fullName = propertyName;
}
- return Collections.singleton(new PropertyExistenceImpl(selector,
selectorName, propertyName));
+ return Collections.singleton(new PropertyExistenceImpl(selector,
selectorName, fullName));
}
@Override
