I recognize that part of what happened here was a test of commiting a patch that came from a github pull request, and seeing how the commit affected the pull request metadata in github ... but ...
Since there actually *is* a jira for this, and since the patch submitted via github appears to be a modification of a patch initially contributed by a differnet user via jira, can we please make sure to update CHANGES.txt with the Jira# and include recognition for the original patch author... https://github.com/apache/lucene-solr/pull/11.patch > Subject: [PATCH] change the default of hl.phraseLimit to 5000 per SOLR-2794. https://issues.apache.org/jira/browse/SOLR-2794 Patch initially written by "zarni" ... https://issues.apache.org/jira/secure/attachment/12525234/SOLR-2794.patch : Date: Sat, 04 Jan 2014 16:43:32 -0000 : From: [email protected] : Reply-To: [email protected] : To: [email protected] : Subject: svn commit: r1555367 - in /lucene/dev/trunk/solr: CHANGES.txt : core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java : core/src/java/org/apache/solr/highlight/SolrHighlighter.java : : Author: rmuir : Date: Sat Jan 4 16:43:32 2014 : New Revision: 1555367 : : URL: http://svn.apache.org/r1555367 : Log: : pull request #11: change the default of hl.phraseLimit to 5000 : : Modified: : lucene/dev/trunk/solr/CHANGES.txt : lucene/dev/trunk/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java : lucene/dev/trunk/solr/core/src/java/org/apache/solr/highlight/SolrHighlighter.java : : Modified: lucene/dev/trunk/solr/CHANGES.txt : URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1555367&r1=1555366&r2=1555367&view=diff : ============================================================================== : --- lucene/dev/trunk/solr/CHANGES.txt (original) : +++ lucene/dev/trunk/solr/CHANGES.txt Sat Jan 4 16:43:32 2014 : @@ -261,6 +261,9 @@ Other Changes : * SOLR-5590: Upgrade HttpClient/HttpComponents to 4.3.x. : (Karl Wright via Shawn Heisey) : : +* pull request #11: change the default of hl.phraseLimit to 5000. : + (Michael Della Bitta via Robert Muir) : + : ================== 4.6.1 ================== : : Versions of Major Components : : Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java : URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java?rev=1555367&r1=1555366&r2=1555367&view=diff : ============================================================================== : --- lucene/dev/trunk/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java (original) : +++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java Sat Jan 4 16:43:32 2014 : @@ -399,7 +399,7 @@ public class DefaultSolrHighlighter exte : params.getBool( HighlightParams.USE_PHRASE_HIGHLIGHTER, true ), : // FVH cannot process hl.requireFieldMatch parameter per-field basis : params.getBool( HighlightParams.FIELD_MATCH, false ) ); : - fvh.setPhraseLimit(params.getInt(HighlightParams.PHRASE_LIMIT, Integer.MAX_VALUE)); : + fvh.setPhraseLimit(params.getInt(HighlightParams.PHRASE_LIMIT, SolrHighlighter.DEFAULT_PHRASE_LIMIT)); : FieldQuery fieldQuery = fvh.getFieldQuery( query, searcher.getIndexReader() ); : : // Highlight each document : : Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/highlight/SolrHighlighter.java : URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/highlight/SolrHighlighter.java?rev=1555367&r1=1555366&r2=1555367&view=diff : ============================================================================== : --- lucene/dev/trunk/solr/core/src/java/org/apache/solr/highlight/SolrHighlighter.java (original) : +++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/highlight/SolrHighlighter.java Sat Jan 4 16:43:32 2014 : @@ -34,6 +34,8 @@ import org.apache.solr.util.SolrPluginUt : : public abstract class SolrHighlighter : { : + : + public static int DEFAULT_PHRASE_LIMIT = 5000; : public static Logger log = LoggerFactory.getLogger(SolrHighlighter.class); : : @Deprecated : : : -Hoss http://www.lucidworks.com/ --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
