From commits-return-105360-archive-asf-public=cust-asf.ponee.io@lucene.apache.org Thu Dec 6 02:59:39 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 08A2618062B for ; Thu, 6 Dec 2018 02:59:38 +0100 (CET) Received: (qmail 2468 invoked by uid 500); 6 Dec 2018 01:59:37 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 2459 invoked by uid 99); 6 Dec 2018 01:59:37 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Dec 2018 01:59:37 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A817CE116E; Thu, 6 Dec 2018 01:59:37 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: markrmiller@apache.org To: commits@lucene.apache.org Message-Id: <2e26e7281a2e4d56849dc5521f9ce544@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: lucene-solr:branch_7x: SOLR-13040: Add AwaitsFix annotation to TestSQLHandler and improve exception information related to that test. Date: Thu, 6 Dec 2018 01:59:37 +0000 (UTC) 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 Authored: Wed Dec 5 19:34:13 2018 -0600 Committer: markrmiller 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();