You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2015/07/14 15:33:57 UTC
svn commit: r1690929 - in /lucene/dev/branches/branch_5x: ./ lucene/
lucene/core/ lucene/core/src/java/org/apache/lucene/index/
lucene/core/src/java/org/apache/lucene/search/ lucene/join/
lucene/join/src/test/org/apache/lucene/search/join/
Author: mikemccand
Date: Tue Jul 14 13:33:57 2015
New Revision: 1690929
URL: http://svn.apache.org/r1690929
Log:
FilterScorer's wrapped Scorer input should not be null
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/index/DocumentsWriter.java
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterPerThreadPool.java
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/FilterScorer.java
lucene/dev/branches/branch_5x/lucene/join/ (props changed)
lucene/dev/branches/branch_5x/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/DocumentsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/DocumentsWriter.java?rev=1690929&r1=1690928&r2=1690929&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/DocumentsWriter.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/DocumentsWriter.java Tue Jul 14 13:33:57 2015
@@ -211,6 +211,7 @@ final class DocumentsWriter implements C
infoStream.message("DW", "abort");
}
final int limit = perThreadPool.getActiveThreadStateCount();
+ perThreadPool.setAbort();
for (int i = 0; i < limit; i++) {
final ThreadState perThread = perThreadPool.getThreadState(i);
perThread.lock();
@@ -307,6 +308,8 @@ final class DocumentsWriter implements C
// ignore & keep on unlocking
}
}
+
+ perThreadPool.clearAbort();
}
boolean anyChanges() {
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterPerThreadPool.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterPerThreadPool.java?rev=1690929&r1=1690928&r2=1690929&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterPerThreadPool.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterPerThreadPool.java Tue Jul 14 13:33:57 2015
@@ -17,6 +17,7 @@ package org.apache.lucene.index;
*/
import org.apache.lucene.util.ThreadInterruptedException;
+import org.apache.lucene.util.ThreadInterruptedException;
import java.util.ArrayList;
import java.util.List;
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/FilterScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/FilterScorer.java?rev=1690929&r1=1690928&r2=1690929&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/FilterScorer.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/FilterScorer.java Tue Jul 14 13:33:57 2015
@@ -48,6 +48,9 @@ public abstract class FilterScorer exten
*/
public FilterScorer(Scorer in, Weight weight) {
super(weight);
+ if (in == null) {
+ throw new NullPointerException("wrapped Scorer must not be null");
+ }
this.in = in;
}
Modified: lucene/dev/branches/branch_5x/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java?rev=1690929&r1=1690928&r2=1690929&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java (original)
+++ lucene/dev/branches/branch_5x/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java Tue Jul 14 13:33:57 2015
@@ -372,6 +372,9 @@ public class TestJoinUtil extends Lucene
@Override
public Scorer scorer(LeafReaderContext context) throws IOException {
Scorer fieldScorer = fieldWeight.scorer(context);
+ if (fieldScorer == null) {
+ return null;
+ }
final NumericDocValues price = context.reader().getNumericDocValues(priceField);
return new FilterScorer(fieldScorer, this) {
@Override