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 2016/02/08 18:11:42 UTC
[4/5] lucene-solr git commit: factor out a
solrconfig.snippet.randommergepolicy.xml (next: change
solrconfig.snippet.randommergepolicy.xml to use RandomMergePolicyFactory
instead of RandomMergePolicy and change tests using solr.tests.mergePolicy to
use s
factor out a solrconfig.snippet.randommergepolicy.xml (next: change solrconfig.snippet.randommergepolicy.xml to use RandomMergePolicyFactory instead of RandomMergePolicy and change tests using solr.tests.mergePolicy to use solr.tests.mergePolicyFactory instead)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/28d07935
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/28d07935
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/28d07935
Branch: refs/heads/master-solr-8621
Commit: 28d07935bca0227adeb3001982c9028ac33cce50
Parents: 1898612
Author: Christine Poerschke <cp...@apache.org>
Authored: Mon Feb 8 16:42:13 2016 +0000
Committer: Christine Poerschke <cp...@apache.org>
Committed: Mon Feb 8 16:42:13 2016 +0000
----------------------------------------------------------------------
.../collection1/conf/solrconfig-delpolicy1.xml | 2 +-
.../collection1/conf/solrconfig-delpolicy2.xml | 2 +-
.../conf/solrconfig-spellcheckcomponent.xml | 2 +-
.../solrconfig.snippet.randomindexconfig.xml | 2 +-
.../solrconfig.snippet.randommergepolicy.xml | 28 ++++++++++++++++++++
5 files changed, 32 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/28d07935/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy1.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy1.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy1.xml
index 250fc06..798b895 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy1.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy1.xml
@@ -30,7 +30,7 @@
to configure an explicit deletion policy, but we still wnat to randomize as much
as possible.
-->
- <mergePolicy class="${solr.tests.mergePolicy:org.apache.solr.util.RandomMergePolicy}" />
+ <xi:include href="solrconfig.snippet.randommergepolicy.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<useCompoundFile>${useCompoundFile:false}</useCompoundFile>
<maxBufferedDocs>${solr.tests.maxBufferedDocs}</maxBufferedDocs>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/28d07935/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy2.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy2.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy2.xml
index 61391fd..4ef7e82 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy2.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy2.xml
@@ -27,7 +27,7 @@
to configure an explicit deletion policy, but we still wnat to randomize as much
as possible.
-->
- <mergePolicy class="${solr.tests.mergePolicy:org.apache.solr.util.RandomMergePolicy}" />
+ <xi:include href="solrconfig.snippet.randommergepolicy.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<useCompoundFile>${useCompoundFile:false}</useCompoundFile>
<maxBufferedDocs>${solr.tests.maxBufferedDocs}</maxBufferedDocs>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/28d07935/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellcheckcomponent.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellcheckcomponent.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellcheckcomponent.xml
index faa886b..82fac89 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellcheckcomponent.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellcheckcomponent.xml
@@ -20,7 +20,7 @@
<config>
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<indexConfig>
- <mergePolicy class="${solr.tests.mergePolicy:org.apache.solr.util.RandomMergePolicy}" />
+ <xi:include href="solrconfig.snippet.randommergepolicy.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<useCompoundFile>${useCompoundFile:false}</useCompoundFile>
<maxBufferedDocs>${solr.tests.maxBufferedDocs}</maxBufferedDocs>
<ramBufferSizeMB>${solr.tests.ramBufferSizeMB}</ramBufferSizeMB>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/28d07935/solr/core/src/test-files/solr/collection1/conf/solrconfig.snippet.randomindexconfig.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig.snippet.randomindexconfig.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig.snippet.randomindexconfig.xml
index 069ccb8..b40a333 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig.snippet.randomindexconfig.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig.snippet.randomindexconfig.xml
@@ -26,7 +26,7 @@ A solrconfig.xml snippet containing indexConfig settings for randomized testing.
the RandomMergePolicy in all tests - but some tests expect very specific
Merge behavior, so those tests can set it as needed.
-->
- <mergePolicy class="${solr.tests.mergePolicy:org.apache.solr.util.RandomMergePolicy}" />
+ <xi:include href="solrconfig.snippet.randommergepolicy.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<useCompoundFile>${useCompoundFile:false}</useCompoundFile>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/28d07935/solr/core/src/test-files/solr/collection1/conf/solrconfig.snippet.randommergepolicy.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig.snippet.randommergepolicy.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig.snippet.randommergepolicy.xml
new file mode 100644
index 0000000..41ad1aa
--- /dev/null
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig.snippet.randommergepolicy.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" ?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!--
+
+A solrconfig.xml snippet containing mergePolicy settings for randomized testing.
+
+-->
+ <!-- this sys property is not set by SolrTestCaseJ4 because we ideally want to use
+ the RandomMergePolicy in all tests - but some tests expect very specific
+ Merge behavior, so those tests can set it as needed.
+ -->
+ <mergePolicy class="${solr.tests.mergePolicy:org.apache.solr.util.RandomMergePolicy}" />