jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexparvule...@apache.org
Subject svn commit: r1479691 - in /jackrabbit/trunk/jackrabbit-core: pom.xml src/main/java/org/apache/jackrabbit/core/query/lucene/join/JoinMerger.java
Date Mon, 06 May 2013 20:03:53 GMT
Author: alexparvulescu
Date: Mon May  6 20:01:40 2013
New Revision: 1479691

URL: http://svn.apache.org/r1479691
Log:
JCR-3498 OUTER JOIN behavior is improperly excluding some values

Modified:
    jackrabbit/trunk/jackrabbit-core/pom.xml
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/join/JoinMerger.java

Modified: jackrabbit/trunk/jackrabbit-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/pom.xml?rev=1479691&r1=1479690&r2=1479691&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-core/pom.xml Mon May  6 20:01:40 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/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/join/JoinMerger.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/join/JoinMerger.java?rev=1479691&r1=1479690&r2=1479691&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/join/JoinMerger.java
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/join/JoinMerger.java
Mon May  6 20:01:40 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) {



Mime
View raw message