You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-user@lucene.apache.org by Licinio Fernández Maurelo <li...@gmail.com> on 2010/01/19 16:33:50 UTC

Field collapsing patch error

Hi folks,

i've downloaded solr release 1.4 and tried to apply  latest field collapsing
patch<https://issues.apache.org/jira/secure/attachment/12428902/SOLR-236.patch>i've
found . Found errors :

dixi@backend05:~/workspace/solr-release-1.4.0$ patch -p0 -i SOLR-236.patch

patching file src/test/test-files/solr/conf/solrconfig-fieldcollapse.xml
patching file src/test/test-files/solr/conf/schema-fieldcollapse.xml
patching file src/test/test-files/solr/conf/solrconfig.xml
patching file src/test/test-files/fieldcollapse/testResponse.xml
patching file
src/test/org/apache/solr/search/fieldcollapse/FieldCollapsingIntegrationTest.java
patching file
src/test/org/apache/solr/search/fieldcollapse/DistributedFieldCollapsingIntegrationTest.java
patching file
src/test/org/apache/solr/search/fieldcollapse/NonAdjacentDocumentCollapserTest.java

patching file
src/test/org/apache/solr/search/fieldcollapse/AdjacentCollapserTest.java

patching file
src/test/org/apache/solr/handler/component/CollapseComponentTest.java

patching file
src/test/org/apache/solr/client/solrj/response/FieldCollapseResponseTest.java

patching file
src/java/org/apache/solr/search/DocSetAwareCollector.java

patching file
src/java/org/apache/solr/search/fieldcollapse/CollapseGroup.java

patching file
src/java/org/apache/solr/search/fieldcollapse/DocumentCollapseResult.java

patching file
src/java/org/apache/solr/search/fieldcollapse/DocumentCollapser.java

patching file
src/java/org/apache/solr/search/fieldcollapse/collector/CollapseCollectorFactory.java

patching file
src/java/org/apache/solr/search/fieldcollapse/collector/DocumentGroupCountCollapseCollectorFactory.java

patching file
src/java/org/apache/solr/search/fieldcollapse/collector/aggregate/AverageFunction.java

patching file
src/java/org/apache/solr/search/fieldcollapse/collector/aggregate/MinFunction.java

patching file
src/java/org/apache/solr/search/fieldcollapse/collector/aggregate/SumFunction.java

patching file
src/java/org/apache/solr/search/fieldcollapse/collector/aggregate/MaxFunction.java

patching file
src/java/org/apache/solr/search/fieldcollapse/collector/aggregate/AggregateFunction.java

patching file
src/java/org/apache/solr/search/fieldcollapse/collector/CollapseContext.java

patching file
src/java/org/apache/solr/search/fieldcollapse/collector/DocumentFieldsCollapseCollectorFactory.java
patching file
src/java/org/apache/solr/search/fieldcollapse/collector/AggregateCollapseCollectorFactory.java

patching file
src/java/org/apache/solr/search/fieldcollapse/collector/CollapseCollector.java

patching file
src/java/org/apache/solr/search/fieldcollapse/collector/FieldValueCountCollapseCollectorFactory.java

patching file
src/java/org/apache/solr/search/fieldcollapse/collector/AbstractCollapseCollector.java

patching file
src/java/org/apache/solr/search/fieldcollapse/AbstractDocumentCollapser.java

patching file
src/java/org/apache/solr/search/fieldcollapse/NonAdjacentDocumentCollapser.java

patching file
src/java/org/apache/solr/search/fieldcollapse/AdjacentDocumentCollapser.java

patching file
src/java/org/apache/solr/search/fieldcollapse/util/Counter.java

patching file
src/java/org/apache/solr/search/SolrIndexSearcher.java

patching file
src/java/org/apache/solr/search/DocSetHitCollector.java

patching file
src/java/org/apache/solr/handler/component/CollapseComponent.java

patching file
src/java/org/apache/solr/handler/component/QueryComponent.java

Hunk #1 FAILED at
522.

1 out of 1 hunk FAILED -- saving rejects to file
src/java/org/apache/solr/handler/component/QueryComponent.java.rej

patching file
src/java/org/apache/solr/util/DocSetScoreCollector.java

patching file
src/common/org/apache/solr/common/params/CollapseParams.java

patching file src/solrj/org/apache/solr/client/solrj/SolrQuery.java
Hunk #1 FAILED at 17.
Hunk #2 FAILED at 50.
Hunk #3 FAILED at 76.
Hunk #4 FAILED at 148.
Hunk #5 FAILED at 197.
Hunk #6 succeeded at 510 (offset -155 lines).
Hunk #7 succeeded at 566 (offset -155 lines).
5 out of 7 hunks FAILED -- saving rejects to file
src/solrj/org/apache/solr/client/solrj/SolrQuery.java.rej
patching file
src/solrj/org/apache/solr/client/solrj/response/QueryResponse.java
Hunk #1 succeeded at 17 with fuzz 1.
Hunk #2 FAILED at 42.
Hunk #3 FAILED at 58.
Hunk #4 succeeded at 117 with fuzz 2 (offset -8 lines).
Hunk #5 succeeded at 315 with fuzz 2 (offset 17 lines).
2 out of 5 hunks FAILED -- saving rejects to file
src/solrj/org/apache/solr/client/solrj/response/QueryResponse.java.rej
patching file
src/solrj/org/apache/solr/client/solrj/response/FieldCollapseResponse.java

Any ideas?

-- 
Lici
~Java Developer~

Re: Field collapsing patch error

Posted by Joe Calderon <ca...@gmail.com>.
this has come up before, my suggestions would be to use the 12/24
patch with trunk revision 892336

http://www.lucidimagination.com/search/document/797549d29e1810d9/solr_1_4_field_collapsing_what_are_the_steps_for_applying_the_solr_236_patch

2010/1/19 Licinio Fernández Maurelo <li...@gmail.com>:
> Hi folks,
>
> i've downloaded solr release 1.4 and tried to apply  latest field collapsing
> patch<https://issues.apache.org/jira/secure/attachment/12428902/SOLR-236.patch>i've
> found . Found errors :
>
> dixi@backend05:~/workspace/solr-release-1.4.0$ patch -p0 -i SOLR-236.patch
>
> patching file src/test/test-files/solr/conf/solrconfig-fieldcollapse.xml
> patching file src/test/test-files/solr/conf/schema-fieldcollapse.xml
> patching file src/test/test-files/solr/conf/solrconfig.xml
> patching file src/test/test-files/fieldcollapse/testResponse.xml
> patching file
> src/test/org/apache/solr/search/fieldcollapse/FieldCollapsingIntegrationTest.java
> patching file
> src/test/org/apache/solr/search/fieldcollapse/DistributedFieldCollapsingIntegrationTest.java
> patching file
> src/test/org/apache/solr/search/fieldcollapse/NonAdjacentDocumentCollapserTest.java
>
> patching file
> src/test/org/apache/solr/search/fieldcollapse/AdjacentCollapserTest.java
>
> patching file
> src/test/org/apache/solr/handler/component/CollapseComponentTest.java
>
> patching file
> src/test/org/apache/solr/client/solrj/response/FieldCollapseResponseTest.java
>
> patching file
> src/java/org/apache/solr/search/DocSetAwareCollector.java
>
> patching file
> src/java/org/apache/solr/search/fieldcollapse/CollapseGroup.java
>
> patching file
> src/java/org/apache/solr/search/fieldcollapse/DocumentCollapseResult.java
>
> patching file
> src/java/org/apache/solr/search/fieldcollapse/DocumentCollapser.java
>
> patching file
> src/java/org/apache/solr/search/fieldcollapse/collector/CollapseCollectorFactory.java
>
> patching file
> src/java/org/apache/solr/search/fieldcollapse/collector/DocumentGroupCountCollapseCollectorFactory.java
>
> patching file
> src/java/org/apache/solr/search/fieldcollapse/collector/aggregate/AverageFunction.java
>
> patching file
> src/java/org/apache/solr/search/fieldcollapse/collector/aggregate/MinFunction.java
>
> patching file
> src/java/org/apache/solr/search/fieldcollapse/collector/aggregate/SumFunction.java
>
> patching file
> src/java/org/apache/solr/search/fieldcollapse/collector/aggregate/MaxFunction.java
>
> patching file
> src/java/org/apache/solr/search/fieldcollapse/collector/aggregate/AggregateFunction.java
>
> patching file
> src/java/org/apache/solr/search/fieldcollapse/collector/CollapseContext.java
>
> patching file
> src/java/org/apache/solr/search/fieldcollapse/collector/DocumentFieldsCollapseCollectorFactory.java
> patching file
> src/java/org/apache/solr/search/fieldcollapse/collector/AggregateCollapseCollectorFactory.java
>
> patching file
> src/java/org/apache/solr/search/fieldcollapse/collector/CollapseCollector.java
>
> patching file
> src/java/org/apache/solr/search/fieldcollapse/collector/FieldValueCountCollapseCollectorFactory.java
>
> patching file
> src/java/org/apache/solr/search/fieldcollapse/collector/AbstractCollapseCollector.java
>
> patching file
> src/java/org/apache/solr/search/fieldcollapse/AbstractDocumentCollapser.java
>
> patching file
> src/java/org/apache/solr/search/fieldcollapse/NonAdjacentDocumentCollapser.java
>
> patching file
> src/java/org/apache/solr/search/fieldcollapse/AdjacentDocumentCollapser.java
>
> patching file
> src/java/org/apache/solr/search/fieldcollapse/util/Counter.java
>
> patching file
> src/java/org/apache/solr/search/SolrIndexSearcher.java
>
> patching file
> src/java/org/apache/solr/search/DocSetHitCollector.java
>
> patching file
> src/java/org/apache/solr/handler/component/CollapseComponent.java
>
> patching file
> src/java/org/apache/solr/handler/component/QueryComponent.java
>
> Hunk #1 FAILED at
> 522.
>
> 1 out of 1 hunk FAILED -- saving rejects to file
> src/java/org/apache/solr/handler/component/QueryComponent.java.rej
>
> patching file
> src/java/org/apache/solr/util/DocSetScoreCollector.java
>
> patching file
> src/common/org/apache/solr/common/params/CollapseParams.java
>
> patching file src/solrj/org/apache/solr/client/solrj/SolrQuery.java
> Hunk #1 FAILED at 17.
> Hunk #2 FAILED at 50.
> Hunk #3 FAILED at 76.
> Hunk #4 FAILED at 148.
> Hunk #5 FAILED at 197.
> Hunk #6 succeeded at 510 (offset -155 lines).
> Hunk #7 succeeded at 566 (offset -155 lines).
> 5 out of 7 hunks FAILED -- saving rejects to file
> src/solrj/org/apache/solr/client/solrj/SolrQuery.java.rej
> patching file
> src/solrj/org/apache/solr/client/solrj/response/QueryResponse.java
> Hunk #1 succeeded at 17 with fuzz 1.
> Hunk #2 FAILED at 42.
> Hunk #3 FAILED at 58.
> Hunk #4 succeeded at 117 with fuzz 2 (offset -8 lines).
> Hunk #5 succeeded at 315 with fuzz 2 (offset 17 lines).
> 2 out of 5 hunks FAILED -- saving rejects to file
> src/solrj/org/apache/solr/client/solrj/response/QueryResponse.java.rej
> patching file
> src/solrj/org/apache/solr/client/solrj/response/FieldCollapseResponse.java
>
> Any ideas?
>
> --
> Lici
> ~Java Developer~
>