Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LUCENE-1973: Remove deprec MultiValueSource 

git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@834812 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Uwe Schindler 2009-11-11 09:12:18 +00:00
parent 1951724650
commit 552ba37c66
8 changed files with 8 additions and 215 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES.txt
View File

@ -114,7 +114,8 @@ API Changes
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)

2
common-build.xml
View File

@ -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}"/>

5
src/java/org/apache/lucene/search/function/FieldCacheSource.java
View File

@ -44,10 +44,7 @@ import org.apache.lucene.search.FieldCache;
* 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;

135
src/java/org/apache/lucene/search/function/MultiValueSource.java
View File

@ -1,135 +0,0 @@
package org.apache.lucene.search.function;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import java.io.IOException;
import org.apache.lucene.util.ReaderUtil;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.search.Explanation;
/** This class wraps another ValueSource, but protects
* against accidental double RAM usage in FieldCache when
* a composite reader is passed to {@link #getValues}.
*
* <p><b>NOTE</b>: this class adds a CPU penalty to every
* lookup, as it must resolve the incoming document to the
* right sub-reader using a binary search.</p>
*
* @deprecated This class is temporary, to ease the
* migration to segment-based searching. Please change your
* code to not pass composite readers to these APIs. */
public final class MultiValueSource extends ValueSource {
final ValueSource other;
public MultiValueSource(ValueSource other) {
this.other = other;
}
@Override
public DocValues getValues(IndexReader reader) throws IOException {
IndexReader[] subReaders = reader.getSequentialSubReaders();
if (subReaders != null) {
// This is a composite reader
return new MultiDocValues(subReaders);
} else {
// Already an atomic reader -- just delegate
return other.getValues(reader);
}
}
@Override
public String description() {
return other.description();
}
@Override
public boolean equals(Object o) {
if (o instanceof MultiValueSource) {
return ((MultiValueSource) o).other.equals(other);
} else {
return false;
}
}
@Override
public int hashCode() {
return 31 * other.hashCode();
}
private final class MultiDocValues extends DocValues {
final DocValues[] docValues;
final int[] docStarts;
MultiDocValues(IndexReader[] subReaders) throws IOException {
docValues = new DocValues[subReaders.length];
docStarts = new int[subReaders.length];
int base = 0;
for(int i=0;i<subReaders.length;i++) {
docValues[i] = other.getValues(subReaders[i]);
docStarts[i] = base;
base += subReaders[i].maxDoc();
}
}
@Override
public float floatVal(int doc) {
final int n = ReaderUtil.subIndex(doc, docStarts);
return docValues[n].floatVal(doc-docStarts[n]);
}
@Override
public int intVal(int doc) {
final int n = ReaderUtil.subIndex(doc, docStarts);
return docValues[n].intVal(doc-docStarts[n]);
}
@Override
public long longVal(int doc) {
final int n = ReaderUtil.subIndex(doc, docStarts);
return docValues[n].longVal(doc-docStarts[n]);
}
@Override
public double doubleVal(int doc) {
final int n = ReaderUtil.subIndex(doc, docStarts);
return docValues[n].doubleVal(doc-docStarts[n]);
}
@Override
public String strVal(int doc) {
final int n = ReaderUtil.subIndex(doc, docStarts);
return docValues[n].strVal(doc-docStarts[n]);
}
@Override
public String toString(int doc) {
final int n = ReaderUtil.subIndex(doc, docStarts);
return docValues[n].toString(doc-docStarts[n]);
}
@Override
public Explanation explain(int doc) {
final int n = ReaderUtil.subIndex(doc, docStarts);
return docValues[n].explain(doc-docStarts[n]);
}
}
}

5
src/java/org/apache/lucene/search/function/OrdFieldSource.java
View File

@ -49,10 +49,7 @@ import java.io.IOException;
* 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 {

5
src/java/org/apache/lucene/search/function/ReverseOrdFieldSource.java
View File

@ -50,10 +50,7 @@ import java.io.IOException;
* 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 {

4
src/test/org/apache/lucene/search/function/TestOrdValues.java
View File

@ -58,9 +58,9 @@ public class TestOrdValues extends FunctionTestSetup {
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);

64
src/test/org/apache/lucene/search/function/TestValueSource.java
View File

@ -1,64 +0,0 @@
package org.apache.lucene.search.function;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import org.apache.lucene.util.*;
import org.apache.lucene.store.*;
import org.apache.lucene.search.*;
import org.apache.lucene.search.function.*;
import org.apache.lucene.analysis.*;
import org.apache.lucene.index.*;
import org.apache.lucene.document.*;
public class TestValueSource extends LuceneTestCase {
public void testMultiValueSource() throws Exception {
Directory dir = new MockRAMDirectory();
IndexWriter w = new IndexWriter(dir, new WhitespaceAnalyzer(), IndexWriter.MaxFieldLength.UNLIMITED);
Document doc = new Document();
Field f = new Field("field", "", Field.Store.NO, Field.Index.NOT_ANALYZED);
doc.add(f);
for(int i=0;i<17;i++) {
f.setValue(""+i);
w.addDocument(doc);
w.commit();
}
IndexReader r = w.getReader();
w.close();
assertTrue(r.getSequentialSubReaders().length > 1);
ValueSource s1 = new IntFieldSource("field");
DocValues v1 = s1.getValues(r);
DocValues v2 = new MultiValueSource(s1).getValues(r);
for(int i=0;i<r.maxDoc();i++) {
assertEquals(v1.intVal(i), i);
assertEquals(v2.intVal(i), i);
}
FieldCache.DEFAULT.purgeAllCaches();
r.close();
dir.close();
}
}