You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2016/02/10 15:33:17 UTC
lucene-solr git commit: SOLR-8621: fix solrconfig.xml under contrib
and example
Repository: lucene-solr
Updated Branches:
refs/heads/master 7d8f0127b -> a5accccbf
SOLR-8621: fix solrconfig.xml under contrib and example
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/a5accccb
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/a5accccb
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/a5accccb
Branch: refs/heads/master
Commit: a5accccbfcb95ee180d0f069274c07f771844f61
Parents: 7d8f012
Author: Shai Erera <sh...@apache.org>
Authored: Wed Feb 10 16:32:27 2016 +0200
Committer: Shai Erera <sh...@apache.org>
Committed: Wed Feb 10 16:33:01 2016 +0200
----------------------------------------------------------------------
.../solr/collection1/conf/solrconfig.xml | 18 +++---------------
.../test-files/solr/minimr/conf/solrconfig.xml | 18 +++---------------
.../test-files/solr/mrunit/conf/solrconfig.xml | 18 +++---------------
.../collection1/conf/solrconfig.xml | 18 +++---------------
.../solr/solrcloud/conf/solrconfig.xml | 18 +++---------------
.../example-DIH/solr/db/conf/solrconfig.xml | 20 ++++----------------
.../example-DIH/solr/mail/conf/solrconfig.xml | 20 ++++----------------
.../example-DIH/solr/rss/conf/solrconfig.xml | 18 +++---------------
.../example-DIH/solr/solr/conf/solrconfig.xml | 18 +++---------------
.../example-DIH/solr/tika/conf/solrconfig.xml | 18 +++---------------
solr/example/files/conf/solrconfig.xml | 18 +++---------------
11 files changed, 35 insertions(+), 167 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a5accccb/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig.xml b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig.xml
index 1acadd0..2642c1a 100644
--- a/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig.xml
+++ b/solr/contrib/morphlines-core/src/test-files/solr/collection1/conf/solrconfig.xml
@@ -167,23 +167,11 @@
Even older versions of Lucene used LogDocMergePolicy.
-->
<!--
- <mergePolicy class="org.apache.lucene.index.TieredMergePolicy">
+ <mergePolicyFacory class="solr.TieredMergePolicyFactory">
<int name="maxMergeAtOnce">10</int>
<int name="segmentsPerTier">10</int>
- </mergePolicy>
- -->
-
- <!-- Merge Factor
- The merge factor controls how many segments will get merged at a time.
- For TieredMergePolicy, mergeFactor is a convenience parameter which
- will set both MaxMergeAtOnce and SegmentsPerTier at once.
- For LogByteSizeMergePolicy, mergeFactor decides how many new segments
- will be allowed before they are merged into one.
- Default is 10 for both merge policies.
- -->
- <!--
- <mergeFactor>10</mergeFactor>
- -->
+ </mergePolicyFactory>
+ -->
<!-- Expert: Merge Scheduler
The Merge Scheduler in Lucene controls how merges are
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a5accccb/solr/contrib/morphlines-core/src/test-files/solr/minimr/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/morphlines-core/src/test-files/solr/minimr/conf/solrconfig.xml b/solr/contrib/morphlines-core/src/test-files/solr/minimr/conf/solrconfig.xml
index 722b9a6..ac9645e 100644
--- a/solr/contrib/morphlines-core/src/test-files/solr/minimr/conf/solrconfig.xml
+++ b/solr/contrib/morphlines-core/src/test-files/solr/minimr/conf/solrconfig.xml
@@ -182,23 +182,11 @@
Even older versions of Lucene used LogDocMergePolicy.
-->
<!--
- <mergePolicy class="org.apache.lucene.index.TieredMergePolicy">
+ <mergePolicyFacory class="solr.TieredMergePolicyFactory">
<int name="maxMergeAtOnce">10</int>
<int name="segmentsPerTier">10</int>
- </mergePolicy>
- -->
-
- <!-- Merge Factor
- The merge factor controls how many segments will get merged at a time.
- For TieredMergePolicy, mergeFactor is a convenience parameter which
- will set both MaxMergeAtOnce and SegmentsPerTier at once.
- For LogByteSizeMergePolicy, mergeFactor decides how many new segments
- will be allowed before they are merged into one.
- Default is 10 for both merge policies.
- -->
- <!--
- <mergeFactor>10</mergeFactor>
- -->
+ </mergePolicyFactory>
+ -->
<!-- Expert: Merge Scheduler
The Merge Scheduler in Lucene controls how merges are
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a5accccb/solr/contrib/morphlines-core/src/test-files/solr/mrunit/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/morphlines-core/src/test-files/solr/mrunit/conf/solrconfig.xml b/solr/contrib/morphlines-core/src/test-files/solr/mrunit/conf/solrconfig.xml
index 84445fb..c80e9a0 100644
--- a/solr/contrib/morphlines-core/src/test-files/solr/mrunit/conf/solrconfig.xml
+++ b/solr/contrib/morphlines-core/src/test-files/solr/mrunit/conf/solrconfig.xml
@@ -184,23 +184,11 @@
Even older versions of Lucene used LogDocMergePolicy.
-->
<!--
- <mergePolicy class="org.apache.lucene.index.TieredMergePolicy">
+ <mergePolicyFacory class="solr.TieredMergePolicyFactory">
<int name="maxMergeAtOnce">10</int>
<int name="segmentsPerTier">10</int>
- </mergePolicy>
- -->
-
- <!-- Merge Factor
- The merge factor controls how many segments will get merged at a time.
- For TieredMergePolicy, mergeFactor is a convenience parameter which
- will set both MaxMergeAtOnce and SegmentsPerTier at once.
- For LogByteSizeMergePolicy, mergeFactor decides how many new segments
- will be allowed before they are merged into one.
- Default is 10 for both merge policies.
- -->
- <!--
- <mergeFactor>10</mergeFactor>
- -->
+ </mergePolicyFactory>
+ -->
<!-- Expert: Merge Scheduler
The Merge Scheduler in Lucene controls how merges are
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a5accccb/solr/contrib/morphlines-core/src/test-files/solr/solrcelltest/collection1/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/morphlines-core/src/test-files/solr/solrcelltest/collection1/conf/solrconfig.xml b/solr/contrib/morphlines-core/src/test-files/solr/solrcelltest/collection1/conf/solrconfig.xml
index 1acadd0..2642c1a 100644
--- a/solr/contrib/morphlines-core/src/test-files/solr/solrcelltest/collection1/conf/solrconfig.xml
+++ b/solr/contrib/morphlines-core/src/test-files/solr/solrcelltest/collection1/conf/solrconfig.xml
@@ -167,23 +167,11 @@
Even older versions of Lucene used LogDocMergePolicy.
-->
<!--
- <mergePolicy class="org.apache.lucene.index.TieredMergePolicy">
+ <mergePolicyFacory class="solr.TieredMergePolicyFactory">
<int name="maxMergeAtOnce">10</int>
<int name="segmentsPerTier">10</int>
- </mergePolicy>
- -->
-
- <!-- Merge Factor
- The merge factor controls how many segments will get merged at a time.
- For TieredMergePolicy, mergeFactor is a convenience parameter which
- will set both MaxMergeAtOnce and SegmentsPerTier at once.
- For LogByteSizeMergePolicy, mergeFactor decides how many new segments
- will be allowed before they are merged into one.
- Default is 10 for both merge policies.
- -->
- <!--
- <mergeFactor>10</mergeFactor>
- -->
+ </mergePolicyFactory>
+ -->
<!-- Expert: Merge Scheduler
The Merge Scheduler in Lucene controls how merges are
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a5accccb/solr/contrib/morphlines-core/src/test-files/solr/solrcloud/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/morphlines-core/src/test-files/solr/solrcloud/conf/solrconfig.xml b/solr/contrib/morphlines-core/src/test-files/solr/solrcloud/conf/solrconfig.xml
index 50c8c9a..f1f7d96 100644
--- a/solr/contrib/morphlines-core/src/test-files/solr/solrcloud/conf/solrconfig.xml
+++ b/solr/contrib/morphlines-core/src/test-files/solr/solrcloud/conf/solrconfig.xml
@@ -185,23 +185,11 @@
Even older versions of Lucene used LogDocMergePolicy.
-->
<!--
- <mergePolicy class="org.apache.lucene.index.TieredMergePolicy">
+ <mergePolicyFacory class="solr.TieredMergePolicyFactory">
<int name="maxMergeAtOnce">10</int>
<int name="segmentsPerTier">10</int>
- </mergePolicy>
- -->
-
- <!-- Merge Factor
- The merge factor controls how many segments will get merged at a time.
- For TieredMergePolicy, mergeFactor is a convenience parameter which
- will set both MaxMergeAtOnce and SegmentsPerTier at once.
- For LogByteSizeMergePolicy, mergeFactor decides how many new segments
- will be allowed before they are merged into one.
- Default is 10 for both merge policies.
- -->
- <!--
- <mergeFactor>10</mergeFactor>
- -->
+ </mergePolicyFactory>
+ -->
<!-- Expert: Merge Scheduler
The Merge Scheduler in Lucene controls how merges are
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a5accccb/solr/example/example-DIH/solr/db/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/example/example-DIH/solr/db/conf/solrconfig.xml b/solr/example/example-DIH/solr/db/conf/solrconfig.xml
index 9947e6b..a3ba3d5 100644
--- a/solr/example/example-DIH/solr/db/conf/solrconfig.xml
+++ b/solr/example/example-DIH/solr/db/conf/solrconfig.xml
@@ -181,25 +181,13 @@
The default since Solr/Lucene 3.3 is TieredMergePolicy.
The default since Lucene 2.3 was the LogByteSizeMergePolicy,
Even older versions of Lucene used LogDocMergePolicy.
- -->
+ -->
<!--
- <mergePolicy class="org.apache.lucene.index.TieredMergePolicy">
+ <mergePolicyFacory class="solr.TieredMergePolicyFactory">
<int name="maxMergeAtOnce">10</int>
<int name="segmentsPerTier">10</int>
- </mergePolicy>
- -->
-
- <!-- Merge Factor
- The merge factor controls how many segments will get merged at a time.
- For TieredMergePolicy, mergeFactor is a convenience parameter which
- will set both MaxMergeAtOnce and SegmentsPerTier at once.
- For LogByteSizeMergePolicy, mergeFactor decides how many new segments
- will be allowed before they are merged into one.
- Default is 10 for both merge policies.
- -->
- <!--
- <mergeFactor>10</mergeFactor>
- -->
+ </mergePolicyFactory>
+ -->
<!-- Expert: Merge Scheduler
The Merge Scheduler in Lucene controls how merges are
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a5accccb/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/example/example-DIH/solr/mail/conf/solrconfig.xml b/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
index 2e54a0c..4816e03 100644
--- a/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
+++ b/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
@@ -184,25 +184,13 @@
The default since Solr/Lucene 3.3 is TieredMergePolicy.
The default since Lucene 2.3 was the LogByteSizeMergePolicy,
Even older versions of Lucene used LogDocMergePolicy.
- -->
+ -->
<!--
- <mergePolicy class="org.apache.lucene.index.TieredMergePolicy">
+ <mergePolicyFacory class="solr.TieredMergePolicyFactory">
<int name="maxMergeAtOnce">10</int>
<int name="segmentsPerTier">10</int>
- </mergePolicy>
- -->
-
- <!-- Merge Factor
- The merge factor controls how many segments will get merged at a time.
- For TieredMergePolicy, mergeFactor is a convenience parameter which
- will set both MaxMergeAtOnce and SegmentsPerTier at once.
- For LogByteSizeMergePolicy, mergeFactor decides how many new segments
- will be allowed before they are merged into one.
- Default is 10 for both merge policies.
- -->
- <!--
- <mergeFactor>10</mergeFactor>
- -->
+ </mergePolicyFactory>
+ -->
<!-- Expert: Merge Scheduler
The Merge Scheduler in Lucene controls how merges are
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a5accccb/solr/example/example-DIH/solr/rss/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/example/example-DIH/solr/rss/conf/solrconfig.xml b/solr/example/example-DIH/solr/rss/conf/solrconfig.xml
index cf28753..f713294 100644
--- a/solr/example/example-DIH/solr/rss/conf/solrconfig.xml
+++ b/solr/example/example-DIH/solr/rss/conf/solrconfig.xml
@@ -183,23 +183,11 @@
Even older versions of Lucene used LogDocMergePolicy.
-->
<!--
- <mergePolicy class="org.apache.lucene.index.TieredMergePolicy">
+ <mergePolicyFacory class="solr.TieredMergePolicyFactory">
<int name="maxMergeAtOnce">10</int>
<int name="segmentsPerTier">10</int>
- </mergePolicy>
- -->
-
- <!-- Merge Factor
- The merge factor controls how many segments will get merged at a time.
- For TieredMergePolicy, mergeFactor is a convenience parameter which
- will set both MaxMergeAtOnce and SegmentsPerTier at once.
- For LogByteSizeMergePolicy, mergeFactor decides how many new segments
- will be allowed before they are merged into one.
- Default is 10 for both merge policies.
- -->
- <!--
- <mergeFactor>10</mergeFactor>
- -->
+ </mergePolicyFactory>
+ -->
<!-- Expert: Merge Scheduler
The Merge Scheduler in Lucene controls how merges are
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a5accccb/solr/example/example-DIH/solr/solr/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/example/example-DIH/solr/solr/conf/solrconfig.xml b/solr/example/example-DIH/solr/solr/conf/solrconfig.xml
index a9b6414..474b304e 100644
--- a/solr/example/example-DIH/solr/solr/conf/solrconfig.xml
+++ b/solr/example/example-DIH/solr/solr/conf/solrconfig.xml
@@ -183,23 +183,11 @@
Even older versions of Lucene used LogDocMergePolicy.
-->
<!--
- <mergePolicy class="org.apache.lucene.index.TieredMergePolicy">
+ <mergePolicyFacory class="solr.TieredMergePolicyFactory">
<int name="maxMergeAtOnce">10</int>
<int name="segmentsPerTier">10</int>
- </mergePolicy>
- -->
-
- <!-- Merge Factor
- The merge factor controls how many segments will get merged at a time.
- For TieredMergePolicy, mergeFactor is a convenience parameter which
- will set both MaxMergeAtOnce and SegmentsPerTier at once.
- For LogByteSizeMergePolicy, mergeFactor decides how many new segments
- will be allowed before they are merged into one.
- Default is 10 for both merge policies.
- -->
- <!--
- <mergeFactor>10</mergeFactor>
- -->
+ </mergePolicyFactory>
+ -->
<!-- Expert: Merge Scheduler
The Merge Scheduler in Lucene controls how merges are
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a5accccb/solr/example/example-DIH/solr/tika/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/example/example-DIH/solr/tika/conf/solrconfig.xml b/solr/example/example-DIH/solr/tika/conf/solrconfig.xml
index 1a38488..63583a8 100644
--- a/solr/example/example-DIH/solr/tika/conf/solrconfig.xml
+++ b/solr/example/example-DIH/solr/tika/conf/solrconfig.xml
@@ -184,23 +184,11 @@
Even older versions of Lucene used LogDocMergePolicy.
-->
<!--
- <mergePolicy class="org.apache.lucene.index.TieredMergePolicy">
+ <mergePolicyFacory class="solr.TieredMergePolicyFactory">
<int name="maxMergeAtOnce">10</int>
<int name="segmentsPerTier">10</int>
- </mergePolicy>
- -->
-
- <!-- Merge Factor
- The merge factor controls how many segments will get merged at a time.
- For TieredMergePolicy, mergeFactor is a convenience parameter which
- will set both MaxMergeAtOnce and SegmentsPerTier at once.
- For LogByteSizeMergePolicy, mergeFactor decides how many new segments
- will be allowed before they are merged into one.
- Default is 10 for both merge policies.
- -->
- <!--
- <mergeFactor>10</mergeFactor>
- -->
+ </mergePolicyFactory>
+ -->
<!-- Expert: Merge Scheduler
The Merge Scheduler in Lucene controls how merges are
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a5accccb/solr/example/files/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/example/files/conf/solrconfig.xml b/solr/example/files/conf/solrconfig.xml
index 9aef828..2e9df5a 100644
--- a/solr/example/files/conf/solrconfig.xml
+++ b/solr/example/files/conf/solrconfig.xml
@@ -168,23 +168,11 @@
Even older versions of Lucene used LogDocMergePolicy.
-->
<!--
- <mergePolicy class="org.apache.lucene.index.TieredMergePolicy">
+ <mergePolicyFacory class="solr.TieredMergePolicyFactory">
<int name="maxMergeAtOnce">10</int>
<int name="segmentsPerTier">10</int>
- </mergePolicy>
- -->
-
- <!-- Merge Factor
- The merge factor controls how many segments will get merged at a time.
- For TieredMergePolicy, mergeFactor is a convenience parameter which
- will set both MaxMergeAtOnce and SegmentsPerTier at once.
- For LogByteSizeMergePolicy, mergeFactor decides how many new segments
- will be allowed before they are merged into one.
- Default is 10 for both merge policies.
- -->
- <!--
- <mergeFactor>10</mergeFactor>
- -->
+ </mergePolicyFactory>
+ -->
<!-- Expert: Merge Scheduler
The Merge Scheduler in Lucene controls how merges are