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

SOLR-13040: Add AwaitsFix annotation to TestSQLHandler and improve exception information related to that test.

This commit is contained in:
markrmiller 2018-12-05 19:34:13 -06:00
parent b0e6a92ede
commit 38cfd0e259
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
solr/core/src/java/org/apache/solr/handler/export/ExportWriter.java
View File

@ -310,7 +310,7 @@ public class ExportWriter implements SolrCore.RawWriter, Closeable {
}
if (!schemaField.hasDocValues()) {
throw new IOException(field + " must have DocValues to use this feature.");
throw new IOException(schemaField + " must have DocValues to use this feature.");
}
boolean multiValued = schemaField.multiValued();

14
solr/core/src/test/org/apache/solr/handler/TestSQLHandler.java
View File

@ -23,6 +23,7 @@ import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
import java.util.concurrent.TimeUnit;
import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.SolrRequest;
@ -34,6 +35,7 @@ import org.apache.solr.client.solrj.io.stream.SolrStream;
import org.apache.solr.client.solrj.io.stream.TupleStream;
import org.apache.solr.client.solrj.request.QueryRequest;
import org.apache.solr.cloud.AbstractFullDistribZkTestBase;
import org.apache.solr.cloud.SolrCloudTestCase;
import org.apache.solr.common.cloud.Replica;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.ModifiableSolrParams;
@ -53,9 +55,15 @@ public class TestSQLHandler extends AbstractFullDistribZkTestBase {
sliceCount = 2;
}
@Override
protected String getCloudSolrConfig() {
return "solrconfig-sql.xml";
}
@Override
protected String getCloudSchemaFile() {
return schemaString;
}
@Before
@Override
@ -77,11 +85,9 @@ public class TestSQLHandler extends AbstractFullDistribZkTestBase {
}
@Test
//28-June-2018 @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 21-May-2018
//@LuceneTestCase.BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 2-Aug-2018
@BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // added 15-Sep-2018
@AwaitsFix(bugUrl="https://issues.apache.org/jira/browse/SOLR-13040")
public void doTest() throws Exception {
waitForRecoveriesToFinish(false);
cloudClient.waitForState(DEFAULT_COLLECTION, 30, TimeUnit.SECONDS, SolrCloudTestCase.activeClusterShape(sliceCount, 4));
testBasicSelect();
testWhere();