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 al...@apache.org on 2014/09/22 16:49:23 UTC
svn commit: r1626795 - in /jackrabbit/oak/branches/1.0: ./
oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/Cursors.java
oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexAggregationTest.java
Author: alexparvulescu
Date: Mon Sep 22 14:49:22 2014
New Revision: 1626795
URL: http://svn.apache.org/r1626795
Log:
OAK-2118 Aggregation cursor introduces doubles in the result set
- merged rev 1626770
Modified:
jackrabbit/oak/branches/1.0/ (props changed)
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/Cursors.java
jackrabbit/oak/branches/1.0/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexAggregationTest.java
Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk:r1626770
Modified: jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/Cursors.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/Cursors.java?rev=1626795&r1=1626794&r2=1626795&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/Cursors.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/Cursors.java Mon Sep 22 14:49:22 2014
@@ -452,7 +452,7 @@ public class Cursors {
init = true;
}
IndexRow result = current;
- fetchNext();
+ init = false;
return result;
}
Modified: jackrabbit/oak/branches/1.0/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexAggregationTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexAggregationTest.java?rev=1626795&r1=1626794&r2=1626795&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexAggregationTest.java (original)
+++ jackrabbit/oak/branches/1.0/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexAggregationTest.java Mon Sep 22 14:49:22 2014
@@ -394,6 +394,10 @@ public class LuceneIndexAggregationTest
"//element(*, nt:file)[jcr:contains(., 'dog') and jcr:contains(., 'title')]",
"xpath", ImmutableList.of("/myFolder/myFile"));
+ // double aggregation dupes
+ assertQuery(
+ "//*[(jcr:contains(., 'dog') or jcr:contains(jcr:content, 'dog') )]",
+ "xpath", ImmutableList.of("/myFolder", "/myFolder/myFile", "/myFolder/myFile/jcr:content"));
}
}