You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2015/04/28 12:31:57 UTC
svn commit: r1676466 - in /lucene/dev/branches/branch_5x: ./ lucene/
lucene/core/ lucene/core/src/java/org/apache/lucene/search/
lucene/core/src/java/org/apache/lucene/search/spans/
Author: rmuir
Date: Tue Apr 28 10:31:57 2015
New Revision: 1676466
URL: http://svn.apache.org/r1676466
Log:
LUCENE-6373: cleanup unused variable and generic array warnings
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/lucene/ (props changed)
lucene/dev/branches/branch_5x/lucene/core/ (props changed)
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/DisiPriorityQueue.java
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/MinShouldMatchSumScorer.java
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/SpanOrQuery.java
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/DisiPriorityQueue.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/DisiPriorityQueue.java?rev=1676466&r1=1676465&r2=1676466&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/DisiPriorityQueue.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/DisiPriorityQueue.java Tue Apr 28 10:31:57 2015
@@ -46,6 +46,7 @@ implements Iterable<DisiWrapper<Iter>> {
private final DisiWrapper<Iter>[] heap;
private int size;
+ @SuppressWarnings({"unchecked","rawtypes"})
public DisiPriorityQueue(int maxSize) {
heap = new DisiWrapper[maxSize];
size = 0;
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/MinShouldMatchSumScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/MinShouldMatchSumScorer.java?rev=1676466&r1=1676465&r2=1676466&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/MinShouldMatchSumScorer.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/MinShouldMatchSumScorer.java Tue Apr 28 10:31:57 2015
@@ -98,6 +98,7 @@ final class MinShouldMatchSumScorer exte
final Collection<ChildScorer> childScorers;
final long cost;
+ @SuppressWarnings({"unchecked","rawtypes"})
MinShouldMatchSumScorer(Weight weight, Collection<Scorer> scorers, int minShouldMatch, float[] coord) {
super(weight);
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/SpanOrQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/SpanOrQuery.java?rev=1676466&r1=1676465&r2=1676466&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/SpanOrQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/SpanOrQuery.java Tue Apr 28 10:31:57 2015
@@ -288,8 +288,6 @@ public class SpanOrQuery extends SpanQue
@Override
public int nextStartPosition() throws IOException {
- DisiWrapper<Spans> topDocSpans = byDocQueue.top();
- assert topDocSpans.doc != NO_MORE_DOCS;
if (topPositionSpans == null) {
byPositionQueue.clear();
fillPositionQueue(); // fills byPositionQueue at first position