You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2017/05/12 14:05:40 UTC
[3/4] lucene-solr:jira/solr-8668: Merge branch 'master' into
jira/solr-8668
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 <cp...@apache.org>
Authored: Fri May 12 14:59:20 2017 +0100
Committer: Christine Poerschke <cp...@apache.org>
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 <mergeScheduler>myclass</mergeScheduler> syntax is no longer supported in solrconfig.xml. Please use syntax <mergeScheduler class=\"myclass\"/> instead.",
+ !((solrConfig.getNode(prefix + "/mergeScheduler", false) != null) && (solrConfig.get(prefix + "/mergeScheduler/@class", null) == null)),
+ true);
+ assertWarnOrFail("The <mergePolicy>myclass</mergePolicy> syntax is no longer supported in solrconfig.xml. Please use syntax <mergePolicy class=\"myclass\"/> instead.",
+ !((solrConfig.getNode(prefix + "/mergePolicy", false) != null) && (solrConfig.get(prefix + "/mergePolicy/@class", null) == null)),
+ true);
+ assertWarnOrFail("The <luceneAutoCommit>true|false</luceneAutoCommit> 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, <maxMergeDocs> is no longer supported, configure it on the relevant <mergePolicyFactory> instead.");
+ }
+ }
+ {
+ final int mergeFactor = solrConfig.getInt(prefix+"/mergeFactor");
+ if (mergeFactor != 0) {
+ throw new IllegalArgumentException("Beginning with Solr 7.0, <mergeFactor> is no longer supported, configure it on the relevant <mergePolicyFactory> instead.");
+ }
+ }
ramBufferSizeMB = solrConfig.getDouble(prefix+"/ramBufferSizeMB", def.ramBufferSizeMB);
writeLockTimeout=solrConfig.getInt(prefix+"/writeLockTimeout", def.writeLockTimeout);