Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LUCENE-9456: fix DirectUpdateHandlerTest#testPrepareCommit (#1803) 

Check for specific files being present or not or changing.  Don't make assumptions about file count.
This commit is contained in:
David Smiley 2020-08-30 11:32:56 -04:00 committed by GitHub
parent d847f40237
commit 06903a40ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java
View File

@ -27,6 +27,7 @@ import com.codahale.metrics.Gauge;
import com.codahale.metrics.Meter; import com.codahale.metrics.Meter;
import com.codahale.metrics.Metric; import com.codahale.metrics.Metric;
import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexFileNames;
import org.apache.lucene.store.Directory; import org.apache.lucene.store.Directory;
import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.params.CommonParams; import org.apache.solr.common.params.CommonParams;
@ -38,6 +39,7 @@ import org.apache.solr.index.TieredMergePolicyFactory;
import org.apache.solr.request.LocalSolrQueryRequest; import org.apache.solr.request.LocalSolrQueryRequest;
import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.search.SolrIndexSearcher; import org.apache.solr.search.SolrIndexSearcher;
import org.apache.solr.util.LogLevel;
import org.junit.AfterClass; import org.junit.AfterClass;
import org.junit.Before; import org.junit.Before;
import org.junit.BeforeClass; import org.junit.BeforeClass;
@ -47,10 +49,7 @@ import org.slf4j.LoggerFactory;
import static org.apache.solr.common.params.CommonParams.VERSION_FIELD; import static org.apache.solr.common.params.CommonParams.VERSION_FIELD;
/** @LogLevel("org.apache.solr.update=INFO")
*
*
*/
public class DirectUpdateHandlerTest extends SolrTestCaseJ4 { public class DirectUpdateHandlerTest extends SolrTestCaseJ4 {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@ -392,7 +391,10 @@ public class DirectUpdateHandlerTest extends SolrTestCaseJ4 {
} }
assertU(adoc("id", "1")); assertU(adoc("id", "1"));
int nFiles = d.listAll().length; assertFalse(Arrays.stream(d.listAll()).anyMatch(s -> s.startsWith(IndexFileNames.PENDING_SEGMENTS)));
String beforeSegmentsFile =
Arrays.stream(d.listAll()).filter(s -> s.startsWith(IndexFileNames.SEGMENTS)).findAny().get();
if (log.isInfoEnabled()) { if (log.isInfoEnabled()) {
log.info("FILES before prepareCommit={}", Arrays.asList(d.listAll())); log.info("FILES before prepareCommit={}", Arrays.asList(d.listAll()));
} }
@ -402,7 +404,9 @@ public class DirectUpdateHandlerTest extends SolrTestCaseJ4 {
if (log.isInfoEnabled()) { if (log.isInfoEnabled()) {
log.info("FILES after prepareCommit={}", Arrays.asList(d.listAll())); log.info("FILES after prepareCommit={}", Arrays.asList(d.listAll()));
} }
assertTrue( d.listAll().length > nFiles); // make sure new index files were actually written assertTrue(Arrays.stream(d.listAll()).anyMatch(s -> s.startsWith(IndexFileNames.PENDING_SEGMENTS)));
assertEquals(beforeSegmentsFile,
Arrays.stream(d.listAll()).filter(s -> s.startsWith(IndexFileNames.SEGMENTS)).findAny().get());
assertJQ(req("q", "id:1") assertJQ(req("q", "id:1")
, "/response/numFound==0" , "/response/numFound==0"