svn commit: r1657874 [3/3] - in /lucene/dev/trunk: lucene/ lucene/core/src/java/org/apache/lucene/search/ lucene/core/src/java/org/apache/lucene/search/payloads/ lucene/core/src/java/org/apache/lucene/search/spans/ lucene/core/src/test/org/apache/lucen...

[jp...@apache.org]

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/join/IgnoreAcceptDocsQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/join/IgnoreAcceptDocsQuery.java?rev=1657874&r1=1657873&r2=1657874&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/join/IgnoreAcceptDocsQuery.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/join/IgnoreAcceptDocsQuery.java Fri Feb  6 15:54:53 2015
@@ -53,8 +53,8 @@ public class IgnoreAcceptDocsQuery exten
   }
 
   @Override
-  public Weight createWeight(IndexSearcher searcher) throws IOException {
-    Weight inner = q.createWeight(searcher);
+  public Weight createWeight(IndexSearcher searcher, boolean needsScores) throws IOException {
+    Weight inner = q.createWeight(searcher, needsScores);
     return new IADWeight(inner);
   }
 
@@ -62,6 +62,7 @@ public class IgnoreAcceptDocsQuery exten
     Weight w;
 
     IADWeight(Weight delegate) {
+      super(q);
       this.w = delegate;
     }
 
@@ -71,11 +72,6 @@ public class IgnoreAcceptDocsQuery exten
     }
 
     @Override
-    public Query getQuery() {
-      return q;
-    }
-
-    @Override
     public float getValueForNormalization() throws IOException {
       return w.getValueForNormalization();
     }
@@ -86,8 +82,8 @@ public class IgnoreAcceptDocsQuery exten
     }
 
     @Override
-    public Scorer scorer(LeafReaderContext context, Bits acceptDocs, boolean needsScores) throws IOException {
-      return w.scorer(context, null, needsScores);
+    public Scorer scorer(LeafReaderContext context, Bits acceptDocs) throws IOException {
+      return w.scorer(context, null);
     }
   }
 

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/DeleteByQueryWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/DeleteByQueryWrapper.java?rev=1657874&r1=1657873&r2=1657874&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/DeleteByQueryWrapper.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/DeleteByQueryWrapper.java Fri Feb  6 15:54:53 2015
@@ -64,26 +64,23 @@ final class DeleteByQueryWrapper extends
   }
   
   @Override
-  public Weight createWeight(IndexSearcher searcher) throws IOException {
+  public Weight createWeight(IndexSearcher searcher, boolean needsScores) throws IOException {
     final LeafReader wrapped = wrap((LeafReader) searcher.getIndexReader());
     final IndexSearcher privateContext = new IndexSearcher(wrapped);
-    final Weight inner = in.createWeight(privateContext);
-    return new Weight() {
+    final Weight inner = in.createWeight(privateContext, needsScores);
+    return new Weight(DeleteByQueryWrapper.this) {
       @Override
       public Explanation explain(LeafReaderContext context, int doc) throws IOException { throw new UnsupportedOperationException(); }
 
       @Override
-      public Query getQuery() { return DeleteByQueryWrapper.this; }
-
-      @Override
       public float getValueForNormalization() throws IOException { return inner.getValueForNormalization(); }
 
       @Override
       public void normalize(float norm, float topLevelBoost) { inner.normalize(norm, topLevelBoost); }
 
       @Override
-      public Scorer scorer(LeafReaderContext context, Bits acceptDocs, boolean needsScores) throws IOException {
-        return inner.scorer(privateContext.getIndexReader().leaves().get(0), acceptDocs, needsScores);
+      public Scorer scorer(LeafReaderContext context, Bits acceptDocs) throws IOException {
+        return inner.scorer(privateContext.getIndexReader().leaves().get(0), acceptDocs);
       }
     };
   }

Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestRankQueryPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestRankQueryPlugin.java?rev=1657874&r1=1657873&r2=1657874&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestRankQueryPlugin.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestRankQueryPlugin.java Fri Feb  6 15:54:53 2015
@@ -114,8 +114,8 @@ public class TestRankQueryPlugin extends
       return false;
     }
 
-    public Weight createWeight(IndexSearcher indexSearcher ) throws IOException{
-      return q.createWeight(indexSearcher);
+    public Weight createWeight(IndexSearcher indexSearcher, boolean needsScores) throws IOException{
+      return q.createWeight(indexSearcher, needsScores);
     }
 
     public void setBoost(float boost) {