You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@lucene.apache.org by us...@apache.org on 2009/11/11 10:12:19 UTC
svn commit: r834812 - in /lucene/java/trunk: ./
src/java/org/apache/lucene/search/function/
src/test/org/apache/lucene/search/function/
Author: uschindler
Date: Wed Nov 11 09:12:18 2009
New Revision: 834812
URL: http://svn.apache.org/viewvc?rev=834812&view=rev
Log:
LUCENE-1973: Remove deprec MultiValueSource
Removed:
lucene/java/trunk/src/java/org/apache/lucene/search/function/MultiValueSource.java
lucene/java/trunk/src/test/org/apache/lucene/search/function/TestValueSource.java
Modified:
lucene/java/trunk/CHANGES.txt
lucene/java/trunk/common-build.xml
lucene/java/trunk/src/java/org/apache/lucene/search/function/FieldCacheSource.java
lucene/java/trunk/src/java/org/apache/lucene/search/function/OrdFieldSource.java
lucene/java/trunk/src/java/org/apache/lucene/search/function/ReverseOrdFieldSource.java
lucene/java/trunk/src/test/org/apache/lucene/search/function/TestOrdValues.java
Modified: lucene/java/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/java/trunk/CHANGES.txt?rev=834812&r1=834811&r2=834812&view=diff
==============================================================================
--- lucene/java/trunk/CHANGES.txt (original)
+++ lucene/java/trunk/CHANGES.txt Wed Nov 11 09:12:18 2009
@@ -114,7 +114,8 @@
was deprecated and will be removed in a later version.
(DM Smith, Uwe Schindler)
-* LUCENE-1973: Remove deprecated Similarity methods. (Uwe Schindler)
+* LUCENE-1973: Remove deprecated Similarity methods. Remove deprecated
+ BoostingTermQuery and MultiValueSource. (Uwe Schindler)
* LUCENE-2011: Remove deprecated Scorer.explain(int).
(Uwe Schindler, Mark Miller)
Modified: lucene/java/trunk/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/java/trunk/common-build.xml?rev=834812&r1=834811&r2=834812&view=diff
==============================================================================
--- lucene/java/trunk/common-build.xml (original)
+++ lucene/java/trunk/common-build.xml Wed Nov 11 09:12:18 2009
@@ -42,7 +42,7 @@
<property name="Name" value="Lucene"/>
<property name="dev.version" value="3.0-dev"/>
<property name="version" value="${dev.version}"/>
- <property name="compatibility.tag" value="lucene_2_9_back_compat_tests_20091027"/>
+ <property name="compatibility.tag" value="lucene_2_9_back_compat_tests_20091111"/>
<property name="spec.version" value="${version}"/>
<property name="year" value="2000-${current.year}"/>
<property name="final.name" value="lucene-${name}-${version}"/>
Modified: lucene/java/trunk/src/java/org/apache/lucene/search/function/FieldCacheSource.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/function/FieldCacheSource.java?rev=834812&r1=834811&r2=834812&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/function/FieldCacheSource.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/function/FieldCacheSource.java Wed Nov 11 09:12:18 2009
@@ -44,10 +44,7 @@
* composite (multi-segment) reader, this can easily cause
* double RAM usage for the values in the FieldCache. It's
* best to switch your application to pass only atomic
- * (single segment) readers to this API. Alternatively, for
- * a short-term fix, you could wrap your ValueSource using
- * {@link MultiValueSource}, which costs more CPU per lookup
- * but will not consume double the FieldCache RAM.</p>
+ * (single segment) readers to this API.</p>
*/
public abstract class FieldCacheSource extends ValueSource {
private String field;
Modified: lucene/java/trunk/src/java/org/apache/lucene/search/function/OrdFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/function/OrdFieldSource.java?rev=834812&r1=834811&r2=834812&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/function/OrdFieldSource.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/function/OrdFieldSource.java Wed Nov 11 09:12:18 2009
@@ -49,10 +49,7 @@
* composite (multi-segment) reader, this can easily cause
* double RAM usage for the values in the FieldCache. It's
* best to switch your application to pass only atomic
- * (single segment) readers to this API. Alternatively, for
- * a short-term fix, you could wrap your ValueSource using
- * {@link MultiValueSource}, which costs more CPU per lookup
- * but will not consume double the FieldCache RAM.</p>
+ * (single segment) readers to this API.</p>
*/
public class OrdFieldSource extends ValueSource {
Modified: lucene/java/trunk/src/java/org/apache/lucene/search/function/ReverseOrdFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/function/ReverseOrdFieldSource.java?rev=834812&r1=834811&r2=834812&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/function/ReverseOrdFieldSource.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/function/ReverseOrdFieldSource.java Wed Nov 11 09:12:18 2009
@@ -50,10 +50,7 @@
* composite (multi-segment) reader, this can easily cause
* double RAM usage for the values in the FieldCache. It's
* best to switch your application to pass only atomic
- * (single segment) readers to this API. Alternatively, for
- * a short-term fix, you could wrap your ValueSource using
- * {@link MultiValueSource}, which costs more CPU per lookup
- * but will not consume double the FieldCache RAM.</p>
+ * (single segment) readers to this API.</p>
*/
public class ReverseOrdFieldSource extends ValueSource {
Modified: lucene/java/trunk/src/test/org/apache/lucene/search/function/TestOrdValues.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/search/function/TestOrdValues.java?rev=834812&r1=834811&r2=834812&view=diff
==============================================================================
--- lucene/java/trunk/src/test/org/apache/lucene/search/function/TestOrdValues.java (original)
+++ lucene/java/trunk/src/test/org/apache/lucene/search/function/TestOrdValues.java Wed Nov 11 09:12:18 2009
@@ -58,9 +58,9 @@
IndexSearcher s = new IndexSearcher(dir, true);
ValueSource vs;
if (inOrder) {
- vs = new MultiValueSource(new OrdFieldSource(field));
+ vs = new OrdFieldSource(field);
} else {
- vs = new MultiValueSource(new ReverseOrdFieldSource(field));
+ vs = new ReverseOrdFieldSource(field);
}
Query q = new ValueSourceQuery(vs);