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/10/26 15:21:15 UTC
lucene-solr:jira/solr-8542-v2: SOLR-8542: test and solrconfig.xml
tweaks
Repository: lucene-solr
Updated Branches:
refs/heads/jira/solr-8542-v2 4f4454cde -> f91f33bca
SOLR-8542: test and solrconfig.xml tweaks
* in TestFeatureExtractionFromMultipleSegments use LuceneTestCase's random() (instead of own local java.security.SecureRandom object
* reduced commented out content in solr/contrib/ltr/example/solrconfig.xml
(mergeFactor is deprecated and not applicable with mergePolicyFactory,
mergePolicyFactory class attribute had lucene.index instead of solr.index)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/f91f33bc
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/f91f33bc
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/f91f33bc
Branch: refs/heads/jira/solr-8542-v2
Commit: f91f33bca701dbb9049bebf9b5ddec9a002ee92f
Parents: 4f4454c
Author: Christine Poerschke <cp...@apache.org>
Authored: Wed Oct 26 09:10:18 2016 -0500
Committer: Christine Poerschke <cp...@apache.org>
Committed: Wed Oct 26 10:17:18 2016 -0500
----------------------------------------------------------------------
solr/contrib/ltr/example/solrconfig.xml | 22 ++------------------
...stFeatureExtractionFromMultipleSegments.java | 5 +----
2 files changed, 3 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f91f33bc/solr/contrib/ltr/example/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/example/solrconfig.xml b/solr/contrib/ltr/example/solrconfig.xml
index 5557991..18d6cb8 100644
--- a/solr/contrib/ltr/example/solrconfig.xml
+++ b/solr/contrib/ltr/example/solrconfig.xml
@@ -165,31 +165,13 @@
<!-- <maxBufferedDocs>1000</maxBufferedDocs> -->
<!-- Expert: Merge Policy
- The Merge Policy in Lucene controls how merging of segments is done.
- 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.
-->
<!--
- <mergePolicyFactory class="org.apache.lucene.index.TieredMergePolicyFactory">
- <int name="maxMergeAtOnce">10</int>
- <int name="segmentsPerTier">10</int>
- <double name="noCFSRatio">0.1</double>
+ <mergePolicyFactory class="...">
+ ...
</mergePolicyFactory>
-->
- <!-- 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>
- -->
-
<!-- Expert: Merge Scheduler
The Merge Scheduler in Lucene controls how merges are
performed. The ConcurrentMergeScheduler (Lucene 2.3 default)
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f91f33bc/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureExtractionFromMultipleSegments.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureExtractionFromMultipleSegments.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureExtractionFromMultipleSegments.java
index 7dbd95d..fc6985c 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureExtractionFromMultipleSegments.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureExtractionFromMultipleSegments.java
@@ -16,8 +16,6 @@
*/
package org.apache.solr.ltr.feature;
-import java.security.SecureRandom;
-
import java.util.List;
import java.util.Map;
import org.apache.solr.client.solrj.SolrQuery;
@@ -30,12 +28,11 @@ import org.noggit.ObjectBuilder;
public class TestFeatureExtractionFromMultipleSegments extends TestRerankBase {
static final String AB = "abcdefghijklmnopqrstuvwxyz";
- static SecureRandom rnd = new SecureRandom();
static String randomString( int len ){
StringBuilder sb = new StringBuilder( len );
for( int i = 0; i < len; i++ )
- sb.append( AB.charAt( rnd.nextInt(AB.length()) ) );
+ sb.append( AB.charAt( random().nextInt(AB.length()) ) );
return sb.toString();
}