lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From markrmil...@apache.org
Subject lucene-solr:branch_7x: SOLR-13040: Add AwaitsFix annotation to TestSQLHandler and improve exception information related to that test.
Date Thu, 06 Dec 2018 01:59:37 GMT
Repository: lucene-solr
Updated Branches:
  refs/heads/branch_7x eaf840867 -> cebd248bb


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


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/cebd248b
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/cebd248b
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/cebd248b

Branch: refs/heads/branch_7x
Commit: cebd248bb55cacb5488d37b5350c613a551fd391
Parents: eaf8408
Author: markrmiller <markrmiller@apache.org>
Authored: Wed Dec 5 19:34:13 2018 -0600
Committer: markrmiller <markrmiller@apache.org>
Committed: Wed Dec 5 19:36:26 2018 -0600

----------------------------------------------------------------------
 .../org/apache/solr/handler/export/ExportWriter.java  |  2 +-
 .../test/org/apache/solr/handler/TestSQLHandler.java  | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/cebd248b/solr/core/src/java/org/apache/solr/handler/export/ExportWriter.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/export/ExportWriter.java b/solr/core/src/java/org/apache/solr/handler/export/ExportWriter.java
index 4aaa6d8..5dff529 100644
--- a/solr/core/src/java/org/apache/solr/handler/export/ExportWriter.java
+++ b/solr/core/src/java/org/apache/solr/handler/export/ExportWriter.java
@@ -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();

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/cebd248b/solr/core/src/test/org/apache/solr/handler/TestSQLHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/TestSQLHandler.java b/solr/core/src/test/org/apache/solr/handler/TestSQLHandler.java
index 220d9ec..21c8a72 100644
--- a/solr/core/src/test/org/apache/solr/handler/TestSQLHandler.java
+++ b/solr/core/src/test/org/apache/solr/handler/TestSQLHandler.java
@@ -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();


Mime
View raw message