You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ds...@apache.org on 2015/04/10 21:04:38 UTC
svn commit: r1672730 - in /lucene/dev/trunk/lucene/core/src:
java/org/apache/lucene/search/ test/org/apache/lucene/search/
Author: dsmiley
Date: Fri Apr 10 19:04:37 2015
New Revision: 1672730
URL: http://svn.apache.org/r1672730
Log:
LUCENE-5579: ConstantScoreWeight is now public
but marked @lucene.internal
Modified:
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/CachingWrapperQuery.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ConstantScoreWeight.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/DocValuesRewriteMethod.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/DocValuesTermsQuery.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/LRUQueryCache.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/MultiTermQueryConstantScoreWrapper.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestLRUQueryCache.java
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/CachingWrapperQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/CachingWrapperQuery.java?rev=1672730&r1=1672729&r2=1672730&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/CachingWrapperQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/CachingWrapperQuery.java Fri Apr 10 19:04:37 2015
@@ -116,7 +116,7 @@ public class CachingWrapperQuery extends
policy.onUse(weight.getQuery());
return new ConstantScoreWeight(weight.getQuery()) {
@Override
- Scorer scorer(LeafReaderContext context, Bits acceptDocs, float score) throws IOException {
+ protected Scorer scorer(LeafReaderContext context, Bits acceptDocs, float score) throws IOException {
final LeafReader reader = context.reader();
final Object key = reader.getCoreCacheKey();
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ConstantScoreWeight.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ConstantScoreWeight.java?rev=1672730&r1=1672729&r2=1672730&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ConstantScoreWeight.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ConstantScoreWeight.java Fri Apr 10 19:04:37 2015
@@ -22,7 +22,12 @@ import java.io.IOException;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.util.Bits;
-abstract class ConstantScoreWeight extends Weight {
+/**
+ * A Weight that has a constant score equal to the boost of the wrapped query.
+ *
+ * @lucene.internal
+ */
+public abstract class ConstantScoreWeight extends Weight {
private float queryNorm;
private float queryWeight;
@@ -68,6 +73,6 @@ abstract class ConstantScoreWeight exten
return scorer(context, acceptDocs, queryWeight);
}
- abstract Scorer scorer(LeafReaderContext context, Bits acceptDocs, float score) throws IOException;
+ protected abstract Scorer scorer(LeafReaderContext context, Bits acceptDocs, float score) throws IOException;
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/DocValuesRewriteMethod.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/DocValuesRewriteMethod.java?rev=1672730&r1=1672729&r2=1672730&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/DocValuesRewriteMethod.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/DocValuesRewriteMethod.java Fri Apr 10 19:04:37 2015
@@ -84,7 +84,7 @@ public final class DocValuesRewriteMetho
public Weight createWeight(IndexSearcher searcher, boolean needsScores) throws IOException {
return new ConstantScoreWeight(this) {
@Override
- Scorer scorer(LeafReaderContext context, Bits acceptDocs, float score) throws IOException {
+ protected Scorer scorer(LeafReaderContext context, Bits acceptDocs, float score) throws IOException {
final SortedSetDocValues fcsi = DocValues.getSortedSet(context.reader(), query.field);
TermsEnum termsEnum = query.getTermsEnum(new Terms() {
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/DocValuesTermsQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/DocValuesTermsQuery.java?rev=1672730&r1=1672729&r2=1672730&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/DocValuesTermsQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/DocValuesTermsQuery.java Fri Apr 10 19:04:37 2015
@@ -149,7 +149,7 @@ public class DocValuesTermsQuery extends
return new ConstantScoreWeight(this) {
@Override
- Scorer scorer(LeafReaderContext context, Bits acceptDocs, float score) throws IOException {
+ protected Scorer scorer(LeafReaderContext context, Bits acceptDocs, float score) throws IOException {
final SortedSetDocValues values = DocValues.getSortedSet(context.reader(), field);
final LongBitSet bits = new LongBitSet(values.getValueCount());
for (BytesRef term : terms) {
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/LRUQueryCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/LRUQueryCache.java?rev=1672730&r1=1672729&r2=1672730&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/LRUQueryCache.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/LRUQueryCache.java Fri Apr 10 19:04:37 2015
@@ -547,7 +547,7 @@ public class LRUQueryCache implements Qu
}
@Override
- Scorer scorer(LeafReaderContext context, Bits acceptDocs, float score) throws IOException {
+ protected Scorer scorer(LeafReaderContext context, Bits acceptDocs, float score) throws IOException {
if (context.ord == 0) {
policy.onUse(getQuery());
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/MultiTermQueryConstantScoreWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/MultiTermQueryConstantScoreWrapper.java?rev=1672730&r1=1672729&r2=1672730&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/MultiTermQueryConstantScoreWrapper.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/MultiTermQueryConstantScoreWrapper.java Fri Apr 10 19:04:37 2015
@@ -87,7 +87,7 @@ final class MultiTermQueryConstantScoreW
public Weight createWeight(IndexSearcher searcher, boolean needsScores) throws IOException {
return new ConstantScoreWeight(this) {
@Override
- Scorer scorer(LeafReaderContext context, Bits acceptDocs, float score) throws IOException {
+ protected Scorer scorer(LeafReaderContext context, Bits acceptDocs, float score) throws IOException {
final Terms terms = context.reader().terms(query.field);
if (terms == null) {
// field does not exist
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestLRUQueryCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestLRUQueryCache.java?rev=1672730&r1=1672729&r2=1672730&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestLRUQueryCache.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestLRUQueryCache.java Fri Apr 10 19:04:37 2015
@@ -33,6 +33,7 @@ import java.util.concurrent.atomic.Atomi
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.AtomicReference;
+import com.carrotsearch.randomizedtesting.generators.RandomPicks;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field.Store;
import org.apache.lucene.document.StringField;
@@ -52,8 +53,6 @@ import org.apache.lucene.util.LuceneTest
import org.apache.lucene.util.RamUsageTester;
import org.apache.lucene.util.TestUtil;
-import com.carrotsearch.randomizedtesting.generators.RandomPicks;
-
public class TestLRUQueryCache extends LuceneTestCase {
private static final QueryCachingPolicy NEVER_CACHE = new QueryCachingPolicy() {
@@ -349,7 +348,7 @@ public class TestLRUQueryCache extends L
public Weight createWeight(IndexSearcher searcher, boolean needsScores) throws IOException {
return new ConstantScoreWeight(this) {
@Override
- Scorer scorer(LeafReaderContext context, Bits acceptDocs, float score) throws IOException {
+ protected Scorer scorer(LeafReaderContext context, Bits acceptDocs, float score) throws IOException {
return null;
}
};
@@ -925,7 +924,7 @@ public class TestLRUQueryCache extends L
return new ConstantScoreWeight(this) {
@Override
- Scorer scorer(LeafReaderContext context, Bits acceptDocs, float score) throws IOException {
+ protected Scorer scorer(LeafReaderContext context, Bits acceptDocs, float score) throws IOException {
return null;
}
};