You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2014/01/04 17:43:32 UTC
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
RE: 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
Posted by Uwe Schindler <uw...@thetaphi.de>.
Hi,
> * comments on pull requests dont go to the dev@ list. i'm not happy about
> this. maybe we can somehow auto-subscribe it?
I opened https://issues.apache.org/jira/browse/INFRA-7157 about this.
Uwe
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: dev-help@lucene.apache.org
Re: 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
Posted by Robert Muir <rc...@gmail.com>.
I investigated about the closing:
other projects just ask the contributor to close the pull request, e.g.
"After the code has been included into the ASF codebase, you need to
close the pull request because we can't do that..."
http://camel.apache.org/contributing.html
On Sat, Jan 4, 2014 at 11:53 AM, Robert Muir <rc...@gmail.com> wrote:
> Some things work well, some things do not.
>
> Things that work:
> * when pull request is opened, it goes to the dev@ list
> * when committed to svn, its referenced correctly in the pull request
> via the github mirror.
>
> Things that dont work:
> * comments on pull requests dont go to the dev@ list. i'm not happy
> about this. maybe we can somehow auto-subscribe it?
> * i have no idea how to close the request, i dont think i have the
> appropriate permissions?
>
> Please see https://github.com/apache/lucene-solr/pull/11 for more details.
>
> On Sat, Jan 4, 2014 at 11:49 AM, Uwe Schindler <uw...@thetaphi.de> wrote:
>> Thanks for testing this out!
>>
>> -----
>> Uwe Schindler
>> H.-H.-Meier-Allee 63, D-28213 Bremen
>> http://www.thetaphi.de
>> eMail: uwe@thetaphi.de
>>
>>> -----Original Message-----
>>> From: rmuir@apache.org [mailto:rmuir@apache.org]
>>> Sent: Saturday, January 04, 2014 5:44 PM
>>> To: commits@lucene.apache.org
>>> 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/DefaultSolrH
>>> ighlighter.java
>>>
>>> lucene/dev/trunk/solr/core/src/java/org/apache/solr/highlight/SolrHighlight
>>> er.java
>>>
>>> Modified: lucene/dev/trunk/solr/CHANGES.txt
>>> URL:
>>> http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=155
>>> 5367&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/DefaultSolrH
>>> ighlighter.java
>>> URL:
>>> http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apa
>>> che/solr/highlight/DefaultSolrHighlighter.java?rev=1555367&r1=1555366&r2=
>>> 1555367&view=diff
>>> ==========================================================
>>> ====================
>>> ---
>>> lucene/dev/trunk/solr/core/src/java/org/apache/solr/highlight/DefaultSolrH
>>> ighlighter.java (original)
>>> +++
>>> lucene/dev/trunk/solr/core/src/java/org/apache/solr/highlight/DefaultSolrH
>>> ighlighter.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/SolrHighlight
>>> er.java
>>> URL:
>>> http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apa
>>> che/solr/highlight/SolrHighlighter.java?rev=1555367&r1=1555366&r2=155536
>>> 7&view=diff
>>> ==========================================================
>>> ====================
>>> ---
>>> lucene/dev/trunk/solr/core/src/java/org/apache/solr/highlight/SolrHighlight
>>> er.java (original)
>>> +++
>>> lucene/dev/trunk/solr/core/src/java/org/apache/solr/highlight/SolrHighlight
>>> er.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
>>
>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
>> For additional commands, e-mail: dev-help@lucene.apache.org
>>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: dev-help@lucene.apache.org
Re: 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
Posted by Robert Muir <rc...@gmail.com>.
Some things work well, some things do not.
Things that work:
* when pull request is opened, it goes to the dev@ list
* when committed to svn, its referenced correctly in the pull request
via the github mirror.
Things that dont work:
* comments on pull requests dont go to the dev@ list. i'm not happy
about this. maybe we can somehow auto-subscribe it?
* i have no idea how to close the request, i dont think i have the
appropriate permissions?
Please see https://github.com/apache/lucene-solr/pull/11 for more details.
On Sat, Jan 4, 2014 at 11:49 AM, Uwe Schindler <uw...@thetaphi.de> wrote:
> Thanks for testing this out!
>
> -----
> Uwe Schindler
> H.-H.-Meier-Allee 63, D-28213 Bremen
> http://www.thetaphi.de
> eMail: uwe@thetaphi.de
>
>> -----Original Message-----
>> From: rmuir@apache.org [mailto:rmuir@apache.org]
>> Sent: Saturday, January 04, 2014 5:44 PM
>> To: commits@lucene.apache.org
>> 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/DefaultSolrH
>> ighlighter.java
>>
>> lucene/dev/trunk/solr/core/src/java/org/apache/solr/highlight/SolrHighlight
>> er.java
>>
>> Modified: lucene/dev/trunk/solr/CHANGES.txt
>> URL:
>> http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=155
>> 5367&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/DefaultSolrH
>> ighlighter.java
>> URL:
>> http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apa
>> che/solr/highlight/DefaultSolrHighlighter.java?rev=1555367&r1=1555366&r2=
>> 1555367&view=diff
>> ==========================================================
>> ====================
>> ---
>> lucene/dev/trunk/solr/core/src/java/org/apache/solr/highlight/DefaultSolrH
>> ighlighter.java (original)
>> +++
>> lucene/dev/trunk/solr/core/src/java/org/apache/solr/highlight/DefaultSolrH
>> ighlighter.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/SolrHighlight
>> er.java
>> URL:
>> http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apa
>> che/solr/highlight/SolrHighlighter.java?rev=1555367&r1=1555366&r2=155536
>> 7&view=diff
>> ==========================================================
>> ====================
>> ---
>> lucene/dev/trunk/solr/core/src/java/org/apache/solr/highlight/SolrHighlight
>> er.java (original)
>> +++
>> lucene/dev/trunk/solr/core/src/java/org/apache/solr/highlight/SolrHighlight
>> er.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
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
> For additional commands, e-mail: dev-help@lucene.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: dev-help@lucene.apache.org
RE: 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
Posted by Uwe Schindler <uw...@thetaphi.de>.
Thanks for testing this out!
-----
Uwe Schindler
H.-H.-Meier-Allee 63, D-28213 Bremen
http://www.thetaphi.de
eMail: uwe@thetaphi.de
> -----Original Message-----
> From: rmuir@apache.org [mailto:rmuir@apache.org]
> Sent: Saturday, January 04, 2014 5:44 PM
> To: commits@lucene.apache.org
> 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/DefaultSolrH
> ighlighter.java
>
> lucene/dev/trunk/solr/core/src/java/org/apache/solr/highlight/SolrHighlight
> er.java
>
> Modified: lucene/dev/trunk/solr/CHANGES.txt
> URL:
> http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=155
> 5367&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/DefaultSolrH
> ighlighter.java
> URL:
> http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apa
> che/solr/highlight/DefaultSolrHighlighter.java?rev=1555367&r1=1555366&r2=
> 1555367&view=diff
> ==========================================================
> ====================
> ---
> lucene/dev/trunk/solr/core/src/java/org/apache/solr/highlight/DefaultSolrH
> ighlighter.java (original)
> +++
> lucene/dev/trunk/solr/core/src/java/org/apache/solr/highlight/DefaultSolrH
> ighlighter.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/SolrHighlight
> er.java
> URL:
> http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apa
> che/solr/highlight/SolrHighlighter.java?rev=1555367&r1=1555366&r2=155536
> 7&view=diff
> ==========================================================
> ====================
> ---
> lucene/dev/trunk/solr/core/src/java/org/apache/solr/highlight/SolrHighlight
> er.java (original)
> +++
> lucene/dev/trunk/solr/core/src/java/org/apache/solr/highlight/SolrHighlight
> er.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
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: dev-help@lucene.apache.org
RE: 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
Posted by Chris Hostetter <ho...@fucit.org>.
: Who is "zarni"? This person is not related tot he issue (owned by Koji) and has no metadata on JIRA at all.
Joji opened the issue, zarni attached the patch later (You need view "All"
on the issue, or click to the "Manage Attachments" screen -- there was no
comment posted when the patch was attached)
https://issues.apache.org/jira/browse/SOLR-2794?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
:
: -----
: Uwe Schindler
: H.-H.-Meier-Allee 63, D-28213 Bremen
: http://www.thetaphi.de
: eMail: uwe@thetaphi.de
:
:
: > -----Original Message-----
: > From: Chris Hostetter [mailto:hossman_lucene@fucit.org]
: > Sent: Saturday, January 04, 2014 6:29 PM
: > To: Lucene Dev
: > Subject: Re: 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
: >
: >
: > 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: rmuir@apache.org
: > : Reply-To: dev@lucene.apache.org
: > : To: commits@lucene.apache.org
: > : 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/DefaultSolrH
: > ighlighter.java
: > :
: > lucene/dev/trunk/solr/core/src/java/org/apache/solr/highlight/SolrHighlight
: > er.java
: > :
: > : Modified: lucene/dev/trunk/solr/CHANGES.txt
: > : URL:
: > http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=155
: > 5367&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/DefaultSolrH
: > ighlighter.java
: > : URL:
: > http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apa
: > che/solr/highlight/DefaultSolrHighlighter.java?rev=1555367&r1=1555366&r2=
: > 1555367&view=diff
: > :
: > ==========================================================
: > ====================
: > : ---
: > lucene/dev/trunk/solr/core/src/java/org/apache/solr/highlight/DefaultSolrH
: > ighlighter.java (original)
: > : +++
: > lucene/dev/trunk/solr/core/src/java/org/apache/solr/highlight/DefaultSolrH
: > ighlighter.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/SolrHighlight
: > er.java
: > : URL:
: > http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apa
: > che/solr/highlight/SolrHighlighter.java?rev=1555367&r1=1555366&r2=155536
: > 7&view=diff
: > :
: > ==========================================================
: > ====================
: > : ---
: > lucene/dev/trunk/solr/core/src/java/org/apache/solr/highlight/SolrHighlight
: > er.java (original)
: > : +++
: > lucene/dev/trunk/solr/core/src/java/org/apache/solr/highlight/SolrHighlight
: > er.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: dev-unsubscribe@lucene.apache.org For additional
: > commands, e-mail: dev-help@lucene.apache.org
:
:
: ---------------------------------------------------------------------
: To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
: For additional commands, e-mail: dev-help@lucene.apache.org
:
:
-Hoss
http://www.lucidworks.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: dev-help@lucene.apache.org
RE: 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
Posted by Uwe Schindler <uw...@thetaphi.de>.
Who is "zarni"? This person is not related tot he issue (owned by Koji) and has no metadata on JIRA at all.
-----
Uwe Schindler
H.-H.-Meier-Allee 63, D-28213 Bremen
http://www.thetaphi.de
eMail: uwe@thetaphi.de
> -----Original Message-----
> From: Chris Hostetter [mailto:hossman_lucene@fucit.org]
> Sent: Saturday, January 04, 2014 6:29 PM
> To: Lucene Dev
> Subject: Re: 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
>
>
> 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: rmuir@apache.org
> : Reply-To: dev@lucene.apache.org
> : To: commits@lucene.apache.org
> : 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/DefaultSolrH
> ighlighter.java
> :
> lucene/dev/trunk/solr/core/src/java/org/apache/solr/highlight/SolrHighlight
> er.java
> :
> : Modified: lucene/dev/trunk/solr/CHANGES.txt
> : URL:
> http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=155
> 5367&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/DefaultSolrH
> ighlighter.java
> : URL:
> http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apa
> che/solr/highlight/DefaultSolrHighlighter.java?rev=1555367&r1=1555366&r2=
> 1555367&view=diff
> :
> ==========================================================
> ====================
> : ---
> lucene/dev/trunk/solr/core/src/java/org/apache/solr/highlight/DefaultSolrH
> ighlighter.java (original)
> : +++
> lucene/dev/trunk/solr/core/src/java/org/apache/solr/highlight/DefaultSolrH
> ighlighter.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/SolrHighlight
> er.java
> : URL:
> http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apa
> che/solr/highlight/SolrHighlighter.java?rev=1555367&r1=1555366&r2=155536
> 7&view=diff
> :
> ==========================================================
> ====================
> : ---
> lucene/dev/trunk/solr/core/src/java/org/apache/solr/highlight/SolrHighlight
> er.java (original)
> : +++
> lucene/dev/trunk/solr/core/src/java/org/apache/solr/highlight/SolrHighlight
> er.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: dev-unsubscribe@lucene.apache.org For additional
> commands, e-mail: dev-help@lucene.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: dev-help@lucene.apache.org
Re: 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
Posted by Chris Hostetter <ho...@fucit.org>.
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: rmuir@apache.org
: Reply-To: dev@lucene.apache.org
: To: commits@lucene.apache.org
: 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: dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: dev-help@lucene.apache.org