You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by al...@apache.org on 2013/05/07 10:42:57 UTC
svn commit: r1479810 - in /jackrabbit/branches/2.6: ./
jackrabbit-core/pom.xml
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/join/JoinMerger.java
Author: alexparvulescu
Date: Tue May 7 08:42:56 2013
New Revision: 1479810
URL: http://svn.apache.org/r1479810
Log:
JCR-3498 OUTER JOIN behavior is improperly excluding some values (backport to 2.6)
Modified:
jackrabbit/branches/2.6/ (props changed)
jackrabbit/branches/2.6/jackrabbit-core/pom.xml
jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/join/JoinMerger.java
Propchange: jackrabbit/branches/2.6/
------------------------------------------------------------------------------
Merged /jackrabbit/trunk:r1479691
Modified: jackrabbit/branches/2.6/jackrabbit-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.6/jackrabbit-core/pom.xml?rev=1479810&r1=1479809&r2=1479810&view=diff
==============================================================================
--- jackrabbit/branches/2.6/jackrabbit-core/pom.xml (original)
+++ jackrabbit/branches/2.6/jackrabbit-core/pom.xml Tue May 7 08:42:56 2013
@@ -114,8 +114,6 @@ org.apache.jackrabbit.test.api.lock.Sess
org.apache.jackrabbit.test.api.observation.NodeReorderTest#testNodeReorderMove
org.apache.jackrabbit.core.data.ConcurrentGcTest#testDatabases
org.apache.jackrabbit.core.data.GarbageCollectorTest#testCloseSessionWhileRunningGc
-org.apache.jackrabbit.test.api.query.qom.EquiJoinConditionTest#testRightOuterJoin1<!--JCR-3493, JCR-3498-->
-org.apache.jackrabbit.test.api.query.qom.EquiJoinConditionTest#testLeftOuterJoin2<!--JCR-3493, JCR-3498-->
</value>
</property>
<property>
Modified: jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/join/JoinMerger.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/join/JoinMerger.java?rev=1479810&r1=1479809&r2=1479810&view=diff
==============================================================================
--- jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/join/JoinMerger.java (original)
+++ jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/join/JoinMerger.java Tue May 7 08:42:56 2013
@@ -230,7 +230,11 @@ abstract class JoinMerger {
List<Row> rows = new ArrayList<Row>();
for (Row leftRow : new RowIterable(leftRows)) {
- for (String value : getLeftValues(leftRow)) {
+ Set<String> leftValues = getLeftValues(leftRow);
+ if(leftValues.isEmpty()){
+ leftValues.add(null);
+ }
+ for (String value : leftValues) {
List<Row> matchingRows = map.get(value);
if (matchingRows != null) {
for (Row rightRow : matchingRows) {