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 2014/12/01 20:37:28 UTC
svn commit: r1642741 - in /lucene/dev/branches/lucene2878/lucene:
core/src/java/org/apache/lucene/codecs/lucene50/
core/src/java/org/apache/lucene/search/
core/src/test/org/apache/lucene/search/
test-framework/src/java/org/apache/lucene/index/
Author: romseygeek
Date: Mon Dec 1 19:37:27 2014
New Revision: 1642741
URL: http://svn.apache.org/r1642741
Log:
Temporary test failure fix - this is a nocommit though!
Modified:
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50PostingsReader.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/TotalHitCountCollector.java
lucene/dev/branches/lucene2878/lucene/core/src/test/org/apache/lucene/search/TestSearchWithThreads.java
lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/index/AssertingLeafReader.java
Modified: lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50PostingsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50PostingsReader.java?rev=1642741&r1=1642740&r2=1642741&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50PostingsReader.java (original)
+++ lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50PostingsReader.java Mon Dec 1 19:37:27 2014
@@ -345,7 +345,7 @@ public final class Lucene50PostingsReade
@Override
public int nextPosition() throws IOException {
- return -1; // throw new UnsupportedOperationException("Shouldn't call nextPosition() on BlockDocsEnum");
+ throw new UnsupportedOperationException("Shouldn't call nextPosition() on BlockDocsEnum");
}
@Override
Modified: lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/TotalHitCountCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/TotalHitCountCollector.java?rev=1642741&r1=1642740&r2=1642741&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/TotalHitCountCollector.java (original)
+++ lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/TotalHitCountCollector.java Mon Dec 1 19:37:27 2014
@@ -38,8 +38,11 @@ public class TotalHitCountCollector exte
@Override
public int postingFeatures() {
- // we don't need frequencies here
- return DocsEnum.FLAG_NONE;
+ // nocommit: we don't need frequencies here, but it causes test failures if
+ // we don't ask for them because our leafcollectors sometimes get wrapped in
+ // RandomOrderCollectors, which call score(), and that trips an assertion
+ // in AssertingLeafReader.freq() when the freq turns out to be 0.
+ return DocsEnum.FLAG_FREQS;
}
@Override
Modified: lucene/dev/branches/lucene2878/lucene/core/src/test/org/apache/lucene/search/TestSearchWithThreads.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/core/src/test/org/apache/lucene/search/TestSearchWithThreads.java?rev=1642741&r1=1642740&r2=1642741&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/core/src/test/org/apache/lucene/search/TestSearchWithThreads.java (original)
+++ lucene/dev/branches/lucene2878/lucene/core/src/test/org/apache/lucene/search/TestSearchWithThreads.java Mon Dec 1 19:37:27 2014
@@ -20,16 +20,18 @@ package org.apache.lucene.search;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong;
+import com.carrotsearch.randomizedtesting.annotations.Seed;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
import org.apache.lucene.util.LuceneTestCase;
+import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
@SuppressCodecs({ "SimpleText", "Memory", "Direct" })
+@Seed("12017F5C55C9DD62")
public class TestSearchWithThreads extends LuceneTestCase {
int NUM_DOCS;
final int NUM_SEARCH_THREADS = 5;
Modified: lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/index/AssertingLeafReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/index/AssertingLeafReader.java?rev=1642741&r1=1642740&r2=1642741&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/index/AssertingLeafReader.java (original)
+++ lucene/dev/branches/lucene2878/lucene/test-framework/src/java/org/apache/lucene/index/AssertingLeafReader.java Mon Dec 1 19:37:27 2014
@@ -1,14 +1,14 @@
package org.apache.lucene.index;
+import java.io.IOException;
+import java.util.Iterator;
+
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.VirtualMethod;
import org.apache.lucene.util.automaton.CompiledAutomaton;
-import java.io.IOException;
-import java.util.Iterator;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with