You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@lucene.apache.org by Chris Hostetter <ho...@fucit.org> on 2014/05/06 23:38:29 UTC
Re: svn commit: r1592880 - in /lucene/dev/branches/lucene_solr_4_8:
./ solr/ solr/core/ solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java
solr/core/src/test/org/apache/solr/search/TestCollapseQParserPlugin.java
Whoops ... thanks Joel.
Aparently the merge i did (r1592821) only picked up your CHANGES.txt entry
and not the actual code fix.
sorry about that.
: Date: Tue, 06 May 2014 20:51:26 -0000
: From: jbernste@apache.org
: Reply-To: dev@lucene.apache.org
: To: commits@lucene.apache.org
: Subject: svn commit: r1592880 - in /lucene/dev/branches/lucene_solr_4_8: ./
: solr/ solr/core/
: solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java
: solr/core/src/test/org/apache/solr/search/TestCollapseQParserPlugin.java
:
: Author: jbernste
: Date: Tue May 6 20:51:25 2014
: New Revision: 1592880
:
: URL: http://svn.apache.org/r1592880
: Log:
: SOLR-6029: CollapsingQParserPlugin throws ArrayIndexOutOfBoundsException if elevated doc has been deleted from a segment
:
: Modified:
: lucene/dev/branches/lucene_solr_4_8/ (props changed)
: lucene/dev/branches/lucene_solr_4_8/solr/ (props changed)
: lucene/dev/branches/lucene_solr_4_8/solr/core/ (props changed)
: lucene/dev/branches/lucene_solr_4_8/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java
: lucene/dev/branches/lucene_solr_4_8/solr/core/src/test/org/apache/solr/search/TestCollapseQParserPlugin.java
:
: Modified: lucene/dev/branches/lucene_solr_4_8/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java
: URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_8/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java?rev=1592880&r1=1592879&r2=1592880&view=diff
: ==============================================================================
: --- lucene/dev/branches/lucene_solr_4_8/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java (original)
: +++ lucene/dev/branches/lucene_solr_4_8/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java Tue May 6 20:51:25 2014
: @@ -262,7 +262,7 @@ public class CollapsingQParserPlugin ext
: if(termsEnum.seekExact(ref)) {
: docsEnum = termsEnum.docs(liveDocs, docsEnum);
: int doc = docsEnum.nextDoc();
: - if(doc != -1) {
: + if(doc != DocsEnum.NO_MORE_DOCS) {
: //Found the document.
: boostDocs.add(doc+docBase);
: it.remove();
:
: Modified: lucene/dev/branches/lucene_solr_4_8/solr/core/src/test/org/apache/solr/search/TestCollapseQParserPlugin.java
: URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_8/solr/core/src/test/org/apache/solr/search/TestCollapseQParserPlugin.java?rev=1592880&r1=1592879&r2=1592880&view=diff
: ==============================================================================
: --- lucene/dev/branches/lucene_solr_4_8/solr/core/src/test/org/apache/solr/search/TestCollapseQParserPlugin.java (original)
: +++ lucene/dev/branches/lucene_solr_4_8/solr/core/src/test/org/apache/solr/search/TestCollapseQParserPlugin.java Tue May 6 20:51:25 2014
: @@ -343,6 +343,23 @@ public class TestCollapseQParserPlugin e
: params.add("group.field", "id");
: assertQ(req(params), "*[count(//doc)=2]");
:
: +
: + // delete the elevated docs, confirm collapsing still works
: + assertU(delI("1"));
: + assertU(delI("2"));
: + assertU(commit());
: + params = new ModifiableSolrParams();
: + params.add("q", "YYYY");
: + params.add("fq", "{!collapse field=group_s nullPolicy=collapse}");
: + params.add("defType", "edismax");
: + params.add("bf", "field(test_ti)");
: + params.add("qf", "term_s");
: + params.add("qt", "/elevate");
: + assertQ(req(params), "*[count(//doc)=2]",
: + "//result/doc[1]/float[@name='id'][.='3.0']",
: + "//result/doc[2]/float[@name='id'][.='6.0']");
: +
: +
: }
:
: @Test
:
:
:
-Hoss
http://www.lucidworks.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: dev-help@lucene.apache.org