Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id EEE79200C72 for ; Fri, 12 May 2017 16:05:40 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id ED73C160BB8; Fri, 12 May 2017 14:05:40 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id DCA5A160BCB for ; Fri, 12 May 2017 16:05:39 +0200 (CEST) Received: (qmail 96704 invoked by uid 500); 12 May 2017 14:05:38 -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 96320 invoked by uid 99); 12 May 2017 14:05:38 -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; Fri, 12 May 2017 14:05:38 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 78E0CE038B; Fri, 12 May 2017 14:05:38 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: cpoerschke@apache.org To: commits@lucene.apache.org Date: Fri, 12 May 2017 14:05:40 -0000 Message-Id: In-Reply-To: <922509f380a146cd958af3c8da5d79d5@git.apache.org> References: <922509f380a146cd958af3c8da5d79d5@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/4] lucene-solr:jira/solr-8668: Merge branch 'master' into jira/solr-8668 archived-at: Fri, 12 May 2017 14:05:41 -0000 Merge branch 'master' into jira/solr-8668 Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/970c2f98 Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/970c2f98 Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/970c2f98 Branch: refs/heads/jira/solr-8668 Commit: 970c2f983f62e8c324188d5727bed2e6184dde4c Parents: 5c07cfb 6d74a9e Author: Christine Poerschke Authored: Fri May 12 14:59:20 2017 +0100 Committer: Christine Poerschke Committed: Fri May 12 14:59:20 2017 +0100 ---------------------------------------------------------------------- dev-tools/idea/.idea/libraries/HSQLDB.xml | 2 +- lucene/ivy-versions.properties | 3 +- solr/CHANGES.txt | 9 +- solr/contrib/dataimporthandler/ivy.xml | 2 +- .../TestVariableResolverEndToEnd.java | 8 +- .../apache/solr/handler/CalciteJDBCStream.java | 75 ++++ .../org/apache/solr/handler/SQLHandler.java | 3 +- .../org/apache/solr/update/SolrIndexConfig.java | 12 + solr/example/example-DIH/ivy.xml | 2 +- solr/licenses/hsqldb-1.8.0.10.jar.sha1 | 1 - solr/licenses/hsqldb-2.4.0.jar.sha1 | 1 + solr/licenses/hsqldb-LICENSE-BSD_LIKE.txt | 9 +- solr/licenses/hsqldb-NOTICE.txt | 135 ++++---- .../solr/client/solrj/io/stream/JDBCStream.java | 342 ++++++++++++++----- .../client/solrj/io/stream/JDBCStreamTest.java | 34 +- 15 files changed, 462 insertions(+), 176 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/970c2f98/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java ---------------------------------------------------------------------- diff --cc solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java index fe2791b,d484e85..740d2d8 --- a/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java +++ b/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java @@@ -119,20 -127,22 +119,32 @@@ public class SolrIndexConfig implement luceneVersion = solrConfig.luceneMatchVersion; + // Assert that end-of-life parameters or syntax is not in our config. + // Warn for luceneMatchVersion's before LUCENE_3_6, fail fast above + assertWarnOrFail("The myclass syntax is no longer supported in solrconfig.xml. Please use syntax instead.", + !((solrConfig.getNode(prefix + "/mergeScheduler", false) != null) && (solrConfig.get(prefix + "/mergeScheduler/@class", null) == null)), + true); + assertWarnOrFail("The myclass syntax is no longer supported in solrconfig.xml. Please use syntax instead.", + !((solrConfig.getNode(prefix + "/mergePolicy", false) != null) && (solrConfig.get(prefix + "/mergePolicy/@class", null) == null)), + true); + assertWarnOrFail("The true|false parameter is no longer valid in solrconfig.xml.", + solrConfig.get(prefix + "/luceneAutoCommit", null) == null, + true); + effectiveUseCompoundFileSetting = solrConfig.getBool(prefix+"/useCompoundFile", def.getUseCompoundFile()); maxBufferedDocs=solrConfig.getInt(prefix+"/maxBufferedDocs",def.maxBufferedDocs); - maxMergeDocs=solrConfig.getInt(prefix+"/maxMergeDocs",def.maxMergeDocs); - mergeFactor=solrConfig.getInt(prefix+"/mergeFactor",def.mergeFactor); + { + final int maxMergeDocs = solrConfig.getInt(prefix+"/maxMergeDocs"); + if (maxMergeDocs != 0) { + throw new IllegalArgumentException("Beginning with Solr 7.0, is no longer supported, configure it on the relevant instead."); + } + } + { + final int mergeFactor = solrConfig.getInt(prefix+"/mergeFactor"); + if (mergeFactor != 0) { + throw new IllegalArgumentException("Beginning with Solr 7.0, is no longer supported, configure it on the relevant instead."); + } + } ramBufferSizeMB = solrConfig.getDouble(prefix+"/ramBufferSizeMB", def.ramBufferSizeMB); writeLockTimeout=solrConfig.getInt(prefix+"/writeLockTimeout", def.writeLockTimeout);