You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ro...@apache.org on 2015/09/16 16:10:42 UTC
svn commit: r1703413 - in /lucene/dev/branches/branch_5x: ./ lucene/
lucene/core/ lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/
lucene/core/src/java/org/apache/lucene/search/
lucene/core/src/java/org/apache/lucene/search/payloads/ lu...
Author: romseygeek
Date: Wed Sep 16 14:10:40 2015
New Revision: 1703413
URL: http://svn.apache.org/r1703413
Log:
LUCENE-6489: Move Payload queries to queries module and PayloadSpanUtil to sandbox
Added:
lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/payloads/
- copied from r1703392, lucene/dev/trunk/lucene/queries/src/java/org/apache/lucene/queries/payloads/
lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/payloads/PayloadNearQuery.java
- copied, changed from r1703412, lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/payloads/PayloadNearQuery.java
lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/payloads/PayloadTermQuery.java
- copied, changed from r1703396, lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/payloads/PayloadTermQuery.java
lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/payloads/SpanNearPayloadCheckQuery.java
- copied, changed from r1703396, lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/payloads/SpanNearPayloadCheckQuery.java
lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/payloads/
- copied from r1703392, lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/payloads/
lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadNearQuery.java
- copied, changed from r1703392, lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadNearQuery.java
lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/payloads/
- copied from r1703392, lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/payloads/
lucene/dev/branches/branch_5x/lucene/sandbox/src/test/org/apache/lucene/payloads/
- copied from r1703392, lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/payloads/
lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/search/spans/MultiSpansWrapper.java
- copied unchanged from r1703392, lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/spans/MultiSpansWrapper.java
Removed:
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/payloads/
lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/payloads/
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/lucene/ (props changed)
lucene/dev/branches/branch_5x/lucene/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_5x/lucene/core/ (props changed)
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PayloadAttribute.java
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/package-info.java
lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestPositionIncrement.java
lucene/dev/branches/branch_5x/lucene/highlighter/ (props changed)
lucene/dev/branches/branch_5x/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java
lucene/dev/branches/branch_5x/lucene/queries/ (props changed)
lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/payloads/PayloadScoreQuery.java
lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadExplanations.java
lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadScoreQuery.java
lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadSpans.java
lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadTermQuery.java
lucene/dev/branches/branch_5x/lucene/queryparser/ (props changed)
lucene/dev/branches/branch_5x/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/BoostingTermBuilder.java
lucene/dev/branches/branch_5x/lucene/sandbox/ (props changed)
lucene/dev/branches/branch_5x/lucene/sandbox/src/test/org/apache/lucene/payloads/TestPayloadSpanUtil.java
lucene/dev/branches/branch_5x/lucene/test-framework/ (props changed)
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/core/ (props changed)
lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/highlight/HighlighterTest.java
Modified: lucene/dev/branches/branch_5x/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/CHANGES.txt?rev=1703413&r1=1703412&r2=1703413&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/lucene/CHANGES.txt Wed Sep 16 14:10:40 2015
@@ -35,6 +35,9 @@ API Changes
* LUCENE-6716: SpanPayloadCheckQuery now takes a List<BytesRef> rather than
a Collection<byte[]>. (Alan Woodward)
+* LUCENE-6489: The various span payload queries have been moved to the queries
+ submodule, and PayloadSpanUtil is now in sandbox. (Alan Woodward)
+
Optimizations
* LUCENE-6708: TopFieldCollector does not compute the score several times on the
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PayloadAttribute.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PayloadAttribute.java?rev=1703413&r1=1703412&r2=1703413&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PayloadAttribute.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PayloadAttribute.java Wed Sep 16 14:10:40 2015
@@ -24,9 +24,7 @@ import org.apache.lucene.util.BytesRef;
* The payload of a Token.
* <p>
* The payload is stored in the index at each position, and can
- * be used to influence scoring when using Payload-based queries
- * in the {@link org.apache.lucene.search.payloads} and
- * {@link org.apache.lucene.search.spans} packages.
+ * be used to influence scoring when using Payload-based queries.
* <p>
* NOTE: because the payload will be stored at each position, it's usually
* best to use the minimum number of bytes necessary. Some codec implementations
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/package-info.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/package-info.java?rev=1703413&r1=1703412&r2=1703413&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/package-info.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/package-info.java Wed Sep 16 14:10:40 2015
@@ -33,7 +33,7 @@
* <h2>Search Basics</h2>
* <p>
* Lucene offers a wide variety of {@link org.apache.lucene.search.Query} implementations, most of which are in
- * this package, its subpackages ({@link org.apache.lucene.search.spans spans}, {@link org.apache.lucene.search.payloads payloads}),
+ * this package, its subpackage ({@link org.apache.lucene.search.spans spans},
* or the <a href="{@docRoot}/../queries/overview-summary.html">queries module</a>. These implementations can be combined in a wide
* variety of ways to provide complex querying capabilities along with information about where matches took place in the document
* collection. The <a href="#query">Query Classes</a> section below highlights some of the more important Query classes. For details
Modified: lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestPositionIncrement.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestPositionIncrement.java?rev=1703413&r1=1703412&r2=1703413&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestPositionIncrement.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestPositionIncrement.java Wed Sep 16 14:10:40 2015
@@ -19,8 +19,8 @@ package org.apache.lucene.search;
import java.io.IOException;
import java.io.StringReader;
-import java.nio.charset.StandardCharsets;
-import java.util.Collection;
+import java.util.ArrayList;
+import java.util.List;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.MockPayloadAnalyzer;
@@ -38,9 +38,8 @@ import org.apache.lucene.index.PostingsE
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.SlowCompositeReaderWrapper;
import org.apache.lucene.index.Term;
-import org.apache.lucene.search.payloads.PayloadSpanCollector;
-import org.apache.lucene.search.payloads.PayloadSpanUtil;
import org.apache.lucene.search.spans.MultiSpansWrapper;
+import org.apache.lucene.search.spans.SpanCollector;
import org.apache.lucene.search.spans.SpanNearQuery;
import org.apache.lucene.search.spans.SpanQuery;
import org.apache.lucene.search.spans.SpanTermQuery;
@@ -201,6 +200,22 @@ public class TestPositionIncrement exten
store.close();
}
+ static class PayloadSpanCollector implements SpanCollector {
+
+ List<BytesRef> payloads = new ArrayList<>();
+
+ @Override
+ public void collectLeaf(PostingsEnum postings, int position, Term term) throws IOException {
+ if (postings.getPayload() != null)
+ payloads.add(BytesRef.deepCopyOf(postings.getPayload()));
+ }
+
+ @Override
+ public void reset() {
+ payloads.clear();
+ }
+ }
+
public void testPayloadsPos0() throws Exception {
Directory dir = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), dir, new MockPayloadAnalyzer());
@@ -248,12 +263,11 @@ public class TestPositionIncrement exten
}
collector.reset();
pspans.collect(collector);
- Collection<byte[]> payloads = collector.getPayloads();
sawZero |= pspans.startPosition() == 0;
- for (byte[] bytes : payloads) {
+ for (BytesRef payload : collector.payloads) {
count++;
if (VERBOSE) {
- System.out.println(" payload: " + new String(bytes, StandardCharsets.UTF_8));
+ System.out.println(" payload: " + Term.toString(payload));
}
}
}
@@ -276,17 +290,6 @@ public class TestPositionIncrement exten
assertEquals(4, count);
assertTrue(sawZero);
- sawZero = false;
- PayloadSpanUtil psu = new PayloadSpanUtil(is.getTopReaderContext());
- Collection<byte[]> pls = psu.getPayloadsForQuery(snq);
- count = pls.size();
- for (byte[] bytes : pls) {
- String s = new String(bytes, StandardCharsets.UTF_8);
- //System.out.println(s);
- sawZero |= s.equals("pos: 0");
- }
- assertEquals(8, count);
- assertTrue(sawZero);
writer.close();
is.getIndexReader().close();
dir.close();
Modified: lucene/dev/branches/branch_5x/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java?rev=1703413&r1=1703412&r2=1703413&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java (original)
+++ lucene/dev/branches/branch_5x/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java Wed Sep 16 14:10:40 2015
@@ -82,7 +82,7 @@ import org.apache.lucene.search.join.Que
import org.apache.lucene.search.join.ScoreMode;
import org.apache.lucene.search.join.ToChildBlockJoinQuery;
import org.apache.lucene.search.join.ToParentBlockJoinQuery;
-import org.apache.lucene.search.payloads.SpanPayloadCheckQuery;
+import org.apache.lucene.queries.payloads.SpanPayloadCheckQuery;
import org.apache.lucene.search.spans.SpanMultiTermQueryWrapper;
import org.apache.lucene.search.spans.SpanNearQuery;
import org.apache.lucene.search.spans.SpanNotQuery;
Copied: lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/payloads/PayloadNearQuery.java (from r1703412, lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/payloads/PayloadNearQuery.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/payloads/PayloadNearQuery.java?p2=lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/payloads/PayloadNearQuery.java&p1=lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/payloads/PayloadNearQuery.java&r1=1703412&r2=1703413&rev=1703413&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/payloads/PayloadNearQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/payloads/PayloadNearQuery.java Wed Sep 16 14:10:40 2015
@@ -1,4 +1,4 @@
-package org.apache.lucene.search.payloads;
+package org.apache.lucene.queries.payloads;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -26,6 +26,7 @@ import java.util.Map;
import java.util.Objects;
import org.apache.lucene.index.LeafReaderContext;
+import org.apache.lucene.index.PostingsEnum;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.TermContext;
import org.apache.lucene.search.Explanation;
@@ -34,6 +35,7 @@ import org.apache.lucene.search.Scorer;
import org.apache.lucene.search.similarities.DefaultSimilarity;
import org.apache.lucene.search.similarities.Similarity;
import org.apache.lucene.search.similarities.Similarity.SimScorer;
+import org.apache.lucene.search.spans.SpanCollector;
import org.apache.lucene.search.spans.SpanNearQuery;
import org.apache.lucene.search.spans.SpanQuery;
import org.apache.lucene.search.spans.SpanScorer;
@@ -52,11 +54,11 @@ import org.apache.lucene.util.ToStringUt
* ({@link DefaultSimilarity}), you must override {@link DefaultSimilarity#scorePayload(int, int, int, BytesRef)},
* which returns 1 by default.
* <p>
- * Payload scores are aggregated using a pluggable {@link PayloadFunction}.
+ * Payload scores are aggregated using a pluggable {@link org.apache.lucene.queries.payloads.PayloadFunction}.
*
* @see org.apache.lucene.search.similarities.Similarity.SimScorer#computePayloadFactor(int, int, int, BytesRef)
*
- * @deprecated use {@link PayloadScoreQuery} to wrap {@link SpanNearQuery}
+ * @deprecated use {@link org.apache.lucene.queries.payloads.PayloadScoreQuery} to wrap {@link SpanNearQuery}
*/
@Deprecated
public class PayloadNearQuery extends SpanNearQuery {
@@ -181,11 +183,12 @@ public class PayloadNearQuery extends Sp
}
}
- public class PayloadNearSpanScorer extends SpanScorer {
+ public class PayloadNearSpanScorer extends SpanScorer implements SpanCollector {
+
Spans spans;
protected float payloadScore;
private int payloadsSeen;
- private final PayloadSpanCollector collector = new PayloadSpanCollector();
+ private final List<byte[]> payloads = new ArrayList<>();
protected PayloadNearSpanScorer(Spans spans, SpanWeight weight, Similarity.SimScorer docScorer) throws IOException {
super(spans, weight, docScorer);
@@ -225,9 +228,9 @@ public class PayloadNearQuery extends Sp
@Override
protected void doCurrentSpans() throws IOException {
- collector.reset();
- spans.collect(collector);
- processPayloads(collector.getPayloads(), spans.startPosition(), spans.endPosition());
+ reset();
+ spans.collect(this);
+ processPayloads(payloads, spans.startPosition(), spans.endPosition());
}
@Override
@@ -235,6 +238,21 @@ public class PayloadNearQuery extends Sp
return super.scoreCurrentDoc()
* function.docScore(docID(), fieldName, payloadsSeen, payloadScore);
}
+
+ @Override
+ public void collectLeaf(PostingsEnum postings, int position, Term term) throws IOException {
+ BytesRef payload = postings.getPayload();
+ if (payload == null)
+ return;
+ final byte[] bytes = new byte[payload.length];
+ System.arraycopy(payload.bytes, payload.offset, bytes, 0, payload.length);
+ payloads.add(bytes);
+ }
+
+ @Override
+ public void reset() {
+ this.payloads.clear();
+ }
}
}
Modified: lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/payloads/PayloadScoreQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/payloads/PayloadScoreQuery.java?rev=1703413&r1=1703392&r2=1703413&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/payloads/PayloadScoreQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/payloads/PayloadScoreQuery.java Wed Sep 16 14:10:40 2015
@@ -28,7 +28,7 @@ import org.apache.lucene.index.TermConte
import org.apache.lucene.search.Explanation;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Scorer;
-import org.apache.lucene.search.similarities.ClassicSimilarity;
+import org.apache.lucene.search.similarities.DefaultSimilarity;
import org.apache.lucene.search.similarities.Similarity;
import org.apache.lucene.search.spans.SpanCollector;
import org.apache.lucene.search.spans.SpanQuery;
@@ -42,7 +42,7 @@ import org.apache.lucene.util.BytesRef;
* wrapped SpanQuery
*
* NOTE: In order to take advantage of this with the default scoring implementation
- * ({@link ClassicSimilarity}), you must override {@link ClassicSimilarity#scorePayload(int, int, int, BytesRef)},
+ * ({@link DefaultSimilarity}), you must override {@link DefaultSimilarity#scorePayload(int, int, int, BytesRef)},
* which returns 1 by default.
*
* @see org.apache.lucene.search.similarities.Similarity.SimScorer#computePayloadFactor(int, int, int, BytesRef)
Copied: lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/payloads/PayloadTermQuery.java (from r1703396, lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/payloads/PayloadTermQuery.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/payloads/PayloadTermQuery.java?p2=lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/payloads/PayloadTermQuery.java&p1=lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/payloads/PayloadTermQuery.java&r1=1703396&r2=1703413&rev=1703413&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/payloads/PayloadTermQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/payloads/PayloadTermQuery.java Wed Sep 16 14:10:40 2015
@@ -1,4 +1,4 @@
-package org.apache.lucene.search.payloads;
+package org.apache.lucene.queries.payloads;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
Copied: lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/payloads/SpanNearPayloadCheckQuery.java (from r1703396, lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/payloads/SpanNearPayloadCheckQuery.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/payloads/SpanNearPayloadCheckQuery.java?p2=lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/payloads/SpanNearPayloadCheckQuery.java&p1=lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/payloads/SpanNearPayloadCheckQuery.java&r1=1703396&r2=1703413&rev=1703413&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/payloads/SpanNearPayloadCheckQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/queries/src/java/org/apache/lucene/queries/payloads/SpanNearPayloadCheckQuery.java Wed Sep 16 14:10:40 2015
@@ -1,4 +1,4 @@
-package org.apache.lucene.search.payloads;
+package org.apache.lucene.queries.payloads;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
Modified: lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadExplanations.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadExplanations.java?rev=1703413&r1=1703392&r2=1703413&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadExplanations.java (original)
+++ lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadExplanations.java Wed Sep 16 14:10:40 2015
@@ -19,7 +19,7 @@ package org.apache.lucene.queries.payloa
import org.apache.lucene.index.Term;
import org.apache.lucene.search.BaseExplanationTestCase;
-import org.apache.lucene.search.similarities.ClassicSimilarity;
+import org.apache.lucene.search.similarities.DefaultSimilarity;
import org.apache.lucene.search.spans.SpanBoostQuery;
import org.apache.lucene.search.spans.SpanNearQuery;
import org.apache.lucene.search.spans.SpanOrQuery;
@@ -41,7 +41,7 @@ public class TestPayloadExplanations ext
@Override
public void setUp() throws Exception {
super.setUp();
- searcher.setSimilarity(new ClassicSimilarity() {
+ searcher.setSimilarity(new DefaultSimilarity() {
@Override
public float scorePayload(int doc, int start, int end, BytesRef payload) {
return 1 + (payload.hashCode() % 10);
Copied: lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadNearQuery.java (from r1703392, lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadNearQuery.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadNearQuery.java?p2=lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadNearQuery.java&p1=lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadNearQuery.java&r1=1703392&r2=1703413&rev=1703413&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadNearQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadNearQuery.java Wed Sep 16 14:10:40 2015
@@ -1,4 +1,4 @@
-package org.apache.lucene.search.payloads;
+package org.apache.lucene.queries.payloads;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -264,7 +264,7 @@ public class TestPayloadNearQuery extend
String[] wordList = words.split("[\\s]+");
SpanQuery clauses[] = new SpanQuery[wordList.length];
for (int i=0;i<clauses.length;i++) {
- clauses[i] = new PayloadTermQuery(new Term(fieldName, wordList[i]), new AveragePayloadFunction());
+ clauses[i] = new PayloadTermQuery(new Term(fieldName, wordList[i]), new AveragePayloadFunction());
}
return new SpanNearQuery(clauses, 10000, false);
}
Modified: lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadScoreQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadScoreQuery.java?rev=1703413&r1=1703392&r2=1703413&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadScoreQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadScoreQuery.java Wed Sep 16 14:10:40 2015
@@ -37,7 +37,7 @@ import org.apache.lucene.search.Explanat
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.TermStatistics;
import org.apache.lucene.search.TopDocs;
-import org.apache.lucene.search.similarities.ClassicSimilarity;
+import org.apache.lucene.search.similarities.DefaultSimilarity;
import org.apache.lucene.search.spans.SpanContainingQuery;
import org.apache.lucene.search.spans.SpanNearQuery;
import org.apache.lucene.search.spans.SpanOrQuery;
@@ -234,7 +234,7 @@ public class TestPayloadScoreQuery exten
directory = null;
}
- static class BoostingSimilarity extends ClassicSimilarity {
+ static class BoostingSimilarity extends DefaultSimilarity {
@Override
public float queryNorm(float sumOfSquaredWeights) {
Modified: lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadSpans.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadSpans.java?rev=1703413&r1=1703392&r2=1703413&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadSpans.java (original)
+++ lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadSpans.java Wed Sep 16 14:10:40 2015
@@ -40,7 +40,7 @@ import org.apache.lucene.index.RandomInd
import org.apache.lucene.index.Term;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.TopDocs;
-import org.apache.lucene.search.similarities.ClassicSimilarity;
+import org.apache.lucene.search.similarities.DefaultSimilarity;
import org.apache.lucene.search.similarities.Similarity;
import org.apache.lucene.search.spans.MultiSpansWrapper;
import org.apache.lucene.search.spans.SpanCollector;
@@ -57,7 +57,7 @@ import org.apache.lucene.util.LuceneTest
public class TestPayloadSpans extends LuceneTestCase {
private IndexSearcher searcher;
- private Similarity similarity = new ClassicSimilarity();
+ private Similarity similarity = new DefaultSimilarity();
protected IndexReader indexReader;
private IndexReader closeIndexReader;
private Directory directory;
Modified: lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadTermQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadTermQuery.java?rev=1703413&r1=1703392&r2=1703413&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadTermQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadTermQuery.java Wed Sep 16 14:10:40 2015
@@ -37,7 +37,7 @@ import org.apache.lucene.search.IndexSea
import org.apache.lucene.search.QueryUtils;
import org.apache.lucene.search.ScoreDoc;
import org.apache.lucene.search.TopDocs;
-import org.apache.lucene.search.similarities.ClassicSimilarity;
+import org.apache.lucene.search.similarities.DefaultSimilarity;
import org.apache.lucene.search.similarities.Similarity;
import org.apache.lucene.search.spans.MultiSpansWrapper;
import org.apache.lucene.search.spans.SpanQuery;
@@ -255,7 +255,7 @@ public class TestPayloadTermQuery extend
CheckHits.checkHitCollector(random(), query.build(), PayloadHelper.NO_PAYLOAD_FIELD, searcher, results);
}
- static class BoostingSimilarity extends ClassicSimilarity {
+ static class BoostingSimilarity extends DefaultSimilarity {
@Override
public float queryNorm(float sumOfSquaredWeights) {
@@ -298,11 +298,4 @@ public class TestPayloadTermQuery extend
}
}
- 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];
- }
- }
-
}
Modified: lucene/dev/branches/branch_5x/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/BoostingTermBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/BoostingTermBuilder.java?rev=1703413&r1=1703412&r2=1703413&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/BoostingTermBuilder.java (original)
+++ lucene/dev/branches/branch_5x/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/BoostingTermBuilder.java Wed Sep 16 14:10:40 2015
@@ -1,10 +1,10 @@
package org.apache.lucene.queryparser.xml.builders;
import org.apache.lucene.index.Term;
+import org.apache.lucene.queries.payloads.AveragePayloadFunction;
+import org.apache.lucene.queries.payloads.PayloadTermQuery;
import org.apache.lucene.queryparser.xml.DOMUtils;
import org.apache.lucene.queryparser.xml.ParserException;
-import org.apache.lucene.search.payloads.AveragePayloadFunction;
-import org.apache.lucene.search.payloads.PayloadTermQuery;
import org.apache.lucene.search.spans.SpanBoostQuery;
import org.apache.lucene.search.spans.SpanQuery;
import org.w3c.dom.Element;
@@ -41,4 +41,4 @@ public class BoostingTermBuilder extends
return btq;
}
-}
\ No newline at end of file
+}
Modified: lucene/dev/branches/branch_5x/lucene/sandbox/src/test/org/apache/lucene/payloads/TestPayloadSpanUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/sandbox/src/test/org/apache/lucene/payloads/TestPayloadSpanUtil.java?rev=1703413&r1=1703392&r2=1703413&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/sandbox/src/test/org/apache/lucene/payloads/TestPayloadSpanUtil.java (original)
+++ lucene/dev/branches/branch_5x/lucene/sandbox/src/test/org/apache/lucene/payloads/TestPayloadSpanUtil.java Wed Sep 16 14:10:40 2015
@@ -38,7 +38,7 @@ import org.apache.lucene.index.RandomInd
import org.apache.lucene.index.Term;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.TermQuery;
-import org.apache.lucene.search.similarities.ClassicSimilarity;
+import org.apache.lucene.search.similarities.DefaultSimilarity;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
@@ -50,7 +50,7 @@ public class TestPayloadSpanUtil extends
public void testPayloadSpanUtil() throws Exception {
Directory directory = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), directory,
- newIndexWriterConfig(new PayloadAnalyzer()).setSimilarity(new ClassicSimilarity()));
+ newIndexWriterConfig(new PayloadAnalyzer()).setSimilarity(new DefaultSimilarity()));
Document doc = new Document();
doc.add(newTextField(FIELD, "xx rr yy mm pp", Field.Store.YES));
Modified: lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/highlight/HighlighterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/highlight/HighlighterTest.java?rev=1703413&r1=1703412&r2=1703413&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/highlight/HighlighterTest.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/highlight/HighlighterTest.java Wed Sep 16 14:10:40 2015
@@ -28,7 +28,7 @@ import org.apache.lucene.analysis.TokenS
import org.apache.lucene.analysis.core.WhitespaceAnalyzer;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.Query;
-import org.apache.lucene.search.payloads.SpanPayloadCheckQuery;
+import org.apache.lucene.queries.payloads.SpanPayloadCheckQuery;
import org.apache.lucene.search.spans.SpanTermQuery;
import org.apache.lucene.util.BytesRef;
import org.apache.solr.SolrTestCaseJ4;