You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2017/11/17 08:33:27 UTC
[06/40] lucene-solr:jira/solr-11285-sim: LUCENE-8014: Remove
TFIDFSimilarity.sloppyFreq() and scorePayload()
LUCENE-8014: Remove TFIDFSimilarity.sloppyFreq() and scorePayload()
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/281e84b9
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/281e84b9
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/281e84b9
Branch: refs/heads/jira/solr-11285-sim
Commit: 281e84b988a518d2f14ed11e291d5fd2c4f18870
Parents: 1aa049b
Author: Alan Woodward <ro...@apache.org>
Authored: Fri Nov 10 11:19:06 2017 +0000
Committer: Alan Woodward <ro...@apache.org>
Committed: Fri Nov 10 11:19:06 2017 +0000
----------------------------------------------------------------------
.../lucene/search/similarities/ClassicSimilarity.java | 7 -------
.../lucene/search/similarities/TFIDFSimilarity.java | 14 --------------
.../src/test/org/apache/lucene/index/TestOmitTf.java | 1 -
.../queries/payloads/TestPayloadExplanations.java | 13 -------------
.../lucene/queries/payloads/TestPayloadTermQuery.java | 14 --------------
5 files changed, 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/281e84b9/lucene/core/src/java/org/apache/lucene/search/similarities/ClassicSimilarity.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/search/similarities/ClassicSimilarity.java b/lucene/core/src/java/org/apache/lucene/search/similarities/ClassicSimilarity.java
index 86ddcaf..2b37e4f 100644
--- a/lucene/core/src/java/org/apache/lucene/search/similarities/ClassicSimilarity.java
+++ b/lucene/core/src/java/org/apache/lucene/search/similarities/ClassicSimilarity.java
@@ -20,7 +20,6 @@ package org.apache.lucene.search.similarities;
import org.apache.lucene.search.CollectionStatistics;
import org.apache.lucene.search.Explanation;
import org.apache.lucene.search.TermStatistics;
-import org.apache.lucene.util.BytesRef;
/**
* Expert: Historical scoring implementation. You might want to consider using
@@ -47,12 +46,6 @@ public class ClassicSimilarity extends TFIDFSimilarity {
return (float)Math.sqrt(freq);
}
- /** The default implementation returns <code>1</code> */
- @Override
- public float scorePayload(int doc, int start, int end, BytesRef payload) {
- return 1;
- }
-
@Override
public Explanation idfExplain(CollectionStatistics collectionStats, TermStatistics termStats) {
final long df = termStats.docFreq();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/281e84b9/lucene/core/src/java/org/apache/lucene/search/similarities/TFIDFSimilarity.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/search/similarities/TFIDFSimilarity.java b/lucene/core/src/java/org/apache/lucene/search/similarities/TFIDFSimilarity.java
index 1d3149b..87b8b52 100644
--- a/lucene/core/src/java/org/apache/lucene/search/similarities/TFIDFSimilarity.java
+++ b/lucene/core/src/java/org/apache/lucene/search/similarities/TFIDFSimilarity.java
@@ -28,7 +28,6 @@ import org.apache.lucene.search.CollectionStatistics;
import org.apache.lucene.search.Explanation;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.TermStatistics;
-import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.SmallFloat;
@@ -511,19 +510,6 @@ public abstract class TFIDFSimilarity extends Similarity {
return SmallFloat.intToByte4(numTerms);
}
- /**
- * Calculate a scoring factor based on the data in the payload. Implementations
- * are responsible for interpreting what is in the payload. Lucene makes no assumptions about
- * what is in the byte array.
- *
- * @param doc The docId currently being scored.
- * @param start The start position of the payload
- * @param end The end position of the payload
- * @param payload The payload byte array to be scored
- * @return An implementation dependent float to be used as a scoring factor
- */
- public abstract float scorePayload(int doc, int start, int end, BytesRef payload);
-
@Override
public final SimWeight computeWeight(float boost, CollectionStatistics collectionStats, TermStatistics... termStats) {
final Explanation idf = termStats.length == 1
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/281e84b9/lucene/core/src/test/org/apache/lucene/index/TestOmitTf.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestOmitTf.java b/lucene/core/src/test/org/apache/lucene/index/TestOmitTf.java
index a249edb..2c179c5 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestOmitTf.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestOmitTf.java
@@ -50,7 +50,6 @@ public class TestOmitTf extends LuceneTestCase {
@Override public Explanation idfExplain(CollectionStatistics collectionStats, TermStatistics[] termStats) {
return Explanation.match(1.0f, "Inexplicable");
}
- @Override public float scorePayload(int doc, int start, int end, BytesRef payload) { return 1.0f; }
}
private static final FieldType omitType = new FieldType(TextField.TYPE_NOT_STORED);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/281e84b9/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadExplanations.java
----------------------------------------------------------------------
diff --git a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadExplanations.java b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadExplanations.java
index 2d1a5b7..0f46cff 100644
--- a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadExplanations.java
+++ b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadExplanations.java
@@ -18,13 +18,11 @@ package org.apache.lucene.queries.payloads;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.BaseExplanationTestCase;
-import org.apache.lucene.search.similarities.ClassicSimilarity;
import org.apache.lucene.search.spans.SpanBoostQuery;
import org.apache.lucene.search.spans.SpanNearQuery;
import org.apache.lucene.search.spans.SpanOrQuery;
import org.apache.lucene.search.spans.SpanQuery;
import org.apache.lucene.search.spans.SpanTermQuery;
-import org.apache.lucene.util.BytesRef;
/**
* TestExplanations subclass focusing on payload queries
@@ -36,17 +34,6 @@ public class TestPayloadExplanations extends BaseExplanationTestCase {
new MinPayloadFunction(),
new MaxPayloadFunction(),
};
-
- @Override
- public void setUp() throws Exception {
- super.setUp();
- searcher.setSimilarity(new ClassicSimilarity() {
- @Override
- public float scorePayload(int doc, int start, int end, BytesRef payload) {
- return 1 + (payload.hashCode() % 10);
- }
- });
- }
/** macro for payloadscorequery */
private SpanQuery pt(String s, PayloadFunction fn) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/281e84b9/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadTermQuery.java
----------------------------------------------------------------------
diff --git a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadTermQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadTermQuery.java
index 82213a8..ce3109e 100644
--- a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadTermQuery.java
+++ b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadTermQuery.java
@@ -256,13 +256,6 @@ public class TestPayloadTermQuery extends LuceneTestCase {
static class BoostingSimilarity extends ClassicSimilarity {
- // TODO: Remove warning after API has been finalized
- @Override
- public float scorePayload(int docId, int start, int end, BytesRef payload) {
- //we know it is size 4 here, so ignore the offset/length
- return payload.bytes[payload.offset];
- }
-
//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
//Make everything else 1 so we see the effect of the payload
//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -282,11 +275,4 @@ public class TestPayloadTermQuery extends LuceneTestCase {
}
}
- static class FullSimilarity extends ClassicSimilarity{
- public float scorePayload(int docId, String fieldName, byte[] payload, int offset, int length) {
- //we know it is size 4 here, so ignore the offset/length
- return payload[offset];
- }
- }
-
}