Author: amitj
Date: Thu Oct 9 07:29:07 2014
New Revision: 1630306
URL: http://svn.apache.org/r1630306
Log:
OAK-2146: empty resultset for PropertyIndex and multi-value properties with
mixed OR+AND
Merge revision r1630299 from trunk
Added:
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/SinglePropertyIndexQueryTests.java
- copied unchanged from r1630299,
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/SinglePropertyIndexQueryTests.java
Modified:
jackrabbit/oak/branches/1.0/ (props changed)
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/FilterImpl.java
Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
Reverse-merged /jackrabbit/oak/trunk:r1629814,1630061,1630084
Merged /jackrabbit/oak/trunk:r1630299
Modified:
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/FilterImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/FilterImpl.java?rev=1630306&r1=1630305&r2=1630306&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/FilterImpl.java
(original)
+++
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/FilterImpl.java
Thu Oct 9 07:29:07 2014
@@ -286,7 +286,12 @@ public class FilterImpl implements Filte
if (x.list == null) {
x.list = list;
} else {
- x.list.retainAll(list);
+ // this is required for multi-valued properties:
+ // for example, if a multi-value property p contains {1, 2},
+ // and we search using "p in (1, 3) and p in (2, 4)", then
+ // this needs to match - so we search for "p in (1, 2, 3, 4)"
+ x.list.removeAll(list);
+ x.list.addAll(list);
}
}
