You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2008/01/10 13:23:04 UTC
svn commit: r610770 - in /jackrabbit/branches/1.4: ./
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/hits/
jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/
jackrabbit-core/src/test/java/org/apache/jackrabbit/core/q...
Author: jukka
Date: Thu Jan 10 04:23:02 2008
New Revision: 610770
URL: http://svn.apache.org/viewvc?rev=610770&view=rev
Log:
1.4: Merged revisions 610717 and 610719 (JCR-1302)
Added:
jackrabbit/branches/1.4/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/lucene/
- copied from r610719, jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/lucene/
jackrabbit/branches/1.4/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/lucene/hits/
- copied from r610719, jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/lucene/hits/
jackrabbit/branches/1.4/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/lucene/hits/ArrayHitsTest.java
- copied unchanged from r610719, jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/lucene/hits/ArrayHitsTest.java
Modified:
jackrabbit/branches/1.4/RELEASE-NOTES.txt
jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/hits/ArrayHits.java
jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/hits/Hits.java
jackrabbit/branches/1.4/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/TestAll.java
Modified: jackrabbit/branches/1.4/RELEASE-NOTES.txt
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.4/RELEASE-NOTES.txt?rev=610770&r1=610769&r2=610770&view=diff
==============================================================================
--- jackrabbit/branches/1.4/RELEASE-NOTES.txt (original)
+++ jackrabbit/branches/1.4/RELEASE-NOTES.txt Thu Jan 10 04:23:02 2008
@@ -360,6 +360,7 @@
[JCR-1274] ItemStateCache in SharedItemStateManager not properly ...
[JCR-1277] ConnectionRecoveryManager is created twice in DBDataStore init ...
[JCR-1298] Wrong schemaObjectPrefix parameter in default repository.xml
+ [JCR-1302] ArrayHits does not end properly when skipTo doesn't find document
Known issues
[JCR-43] Restore on nodes creates same-name-sibling of ...
Modified: jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/hits/ArrayHits.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/hits/ArrayHits.java?rev=610770&r1=610769&r2=610770&view=diff
==============================================================================
--- jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/hits/ArrayHits.java (original)
+++ jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/hits/ArrayHits.java Thu Jan 10 04:23:02 2008
@@ -87,9 +87,9 @@
int nextDocValue = hits[i];
if (nextDocValue >= target) {
index = i;
- break;
+ return next();
}
}
- return next();
+ return -1;
}
}
Modified: jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/hits/Hits.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/hits/Hits.java?rev=610770&r1=610769&r2=610770&view=diff
==============================================================================
--- jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/hits/Hits.java (original)
+++ jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/hits/Hits.java Thu Jan 10 04:23:02 2008
@@ -38,7 +38,8 @@
/**
* Skips to the first match beyond the current whose document number is
- * greater than or equal to the given target.
+ * greater than or equal to the given target. Returns -1 if there is no
+ * matching document number greater than target.
*/
int skipTo(int target) throws IOException;
Modified: jackrabbit/branches/1.4/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/TestAll.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.4/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/TestAll.java?rev=610770&r1=610769&r2=610770&view=diff
==============================================================================
--- jackrabbit/branches/1.4/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/TestAll.java (original)
+++ jackrabbit/branches/1.4/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/TestAll.java Thu Jan 10 04:23:02 2008
@@ -16,6 +16,8 @@
*/
package org.apache.jackrabbit.core.query;
+import org.apache.jackrabbit.core.query.lucene.hits.ArrayHitsTest;
+
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
@@ -51,7 +53,8 @@
suite.addTestSuite(FnNameQueryTest.class);
suite.addTestSuite(PathQueryNodeTest.class);
suite.addTestSuite(SynonymProviderTest.class);
-
+ suite.addTestSuite(ArrayHitsTest.class);
+
// exclude long running tests per default
//suite.addTestSuite(MassiveRangeTest.class);
//suite.addTestSuite(ConcurrentQueryTest.class);