Latest SOLR-236.patch is for the trunk, if have updated the latest patch so it should patch now without conflicts. If I remember correctly the latest field-collapse-5.patch should work for 1.4, but it doesn't for the trunk.
2009/12/23 <r...@intelcompute.com>: > > Sorry, that was when trying to patch the 1.4 branch > > attempting to patch the trunk gives... > > patching file src/test/test-files/fieldcollapse/testResponse.xml > patching file src/test/org/apache/solr/BaseDistributedSearchTestCase.java > Hunk #2 FAILED at 502. > 1 out of 2 hunks FAILED -- saving rejects to file > src/test/org/apache/solr/BaseDistributedSearchTestCase.java.rej > patching file > src/test/org/apache/solr/search/fieldcollapse/FieldCollapsingIntegrationTest.java > > > btw, when is trunk actually updated? > > > > > > On Wed 23/12/09 11:53 , r...@intelcompute.com wrote: > >> I'm currently trying to patch aginst trunk, using SOLR-236.patch >> from 18/12/2009 but getting the following error... >> [ solr]$ patch -p0 < 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 >> can't find file to patch at input line 787 >> Perhaps you used the wrong -p or --strip option? >> The text leading up to this was: >> -------------------------- >> | >> |Property changes on: >> src/test/test-files/fieldcollapse/testResponse.xml >> |___________________________________________________________________ >> |Added: svn:keywords >> | + Date Author Id Revision HeadURL >> |Added: svn:eol-style >> | + native >> | >> |Index: src/test/org/apache/solr/BaseDistributedSearchTestCase.java >> |=================================================================== >> |--- src/test/org/apache/solr/BaseDistributedSearchTestCase.java >> (revision 891214) >> |+++ src/test/org/apache/solr/BaseDistributedSearchTestCase.java >> (working copy) >> -------------------------- >> File to patch: >> any suggestions, or should i checkout the 1.4 branch instead? >> can't remember what i did last time to get field-collapse-5.patch >> working successfully. >> On Tue 22/12/09 22:43 , Lance Norskog wrote: >> > To avoid this possible bug, you could change the cache to only >> have a >> > few entries. >> > On Tue, Dec 22, 2009 at 6:34 AM, Martijn v Groningen >> > wrote: >> > > In the latest patch some changes where made on the configuration >> > side, >> > > but if you add the CollapseComponent to the conf no field >> collapse >> > > cache should be enabled. If not let me know. >> > > >> > > Martijn >> > > >> > > 2009/12/22 : >> > >> >> > >> >> > >> >> > >> >> > >> >> > >> On Tue 22/12/09 12:28 , Martijn v Groningen wrote: >> > >> >> > >>> Hi Rob, >> > >>> What patch are you actually using from SOLR-236? >> > >>> Martijn >> > >>> 2009/12/22 : >> > >>> > I've tried both, the whole fieldCollapsing tag, and just the >> > >>> > fieldCollapseCache tag inside it. >> > >>> > both cause error. >> > >>> > I guess I can just set size, initialSize, and >> > autowarmCount >> > >>> to 0 ?? >> > >>> > On Tue 22/12/09 11:17 , Toby Cole wrote:Which elements did >> > you >> > >>> > comment out? It could be the case that you need >> > >>> > to get rid of the entire fieldCollapsing element, not just >> the >> > >>> > fieldCollapsingCache element. >> > >>> > (Disclaimer: I've not used field collapsing in anger before >> :) >> > >>> > Toby. >> > >>> > >> > >>> > On 22 Dec 2009, at 11:09, wrote: >> > >>> > >> > >>> >> That's what I assumed, but I'm getting the following error >> > with >> > >>> it >> > >>> >> commented out.... >> > >>> >> MESSAGE null java.lang.NullPointerException at >> > >>> >> org >> > >>> >> .apache >> > >>> >> .solr >> > >>> >> .search >> > >>> >> .fieldcollapse >> > >>> >> .AbstractDocumentCollapser >> > >>> >> >> > .createDocumentCollapseResult(AbstractDocumentCollapser.java:276) >> > >>> >> at >> > >>> >> org >> > >>> >> .apache >> > >>> >> .solr >> > >>> >> .search >> > >>> >> .fieldcollapse >> > >>> >> .AbstractDocumentCollapser >> > >>> >> .executeCollapse(AbstractDocumentCollapser.java:249) >> > >>> >> at >> > >>> >> org >> > >>> >> .apache >> > >>> >> .solr >> > >>> >> .search >> > >>> >> .fieldcollapse >> > >>> >> >> > >>> >> > >> .AbstractDocumentCollapser.collapse(AbstractDocumentCollapser.java: >> > >>> > >> > >>> >> 172) >> > >>> >> at >> > >>> >> org >> > >>> >> .apache >> > >>> >> .solr >> > >>> >> .handler >> > >>> >> >> > >>> >> > .component.CollapseComponent.doProcess(CollapseComponent.java:173) >> > >>> >> at >> > >>> >> org >> > >>> >> .apache >> > >>> >> .solr >> > >>> >> >> > >>> > >> > >>> >> > >> .handler.component.CollapseComponent.process(CollapseComponent.java: >> > >>> >> 127) >> > >>> >> at >> > >>> >> org >> > >>> >> .apache >> > >>> >> .solr >> > >>> >> .handler >> > >>> >> >> > >>> >> > .component.SearchHandler.handleRequestBody(SearchHandler.java:195) >> > >>> >> at >> > >>> >> org >> > >>> >> .apache >> > >>> >> .solr >> > >>> >> >> > >>> > >> > >>> >> > >> .handler.RequestHandlerBase.handleRequest(RequestHandlerBase.java:131) >> > >>> >> at >> org.apache.solr.core.SolrCore.execute(SolrCore.java:1316) >> > at >> > >>> >> org >> > >>> >> .apache >> > >>> >> >> > >>> > >> > >>> >> > >> .solr.servlet.SolrDispatchFilter.execute(SolrDispatchFilter.java:336) >> > >>> >> at >> > >>> >> org >> > >>> >> .apache >> > >>> >> >> > >>> > >> > >>> >> > >> .solr.servlet.SolrDispatchFilter.doFilter(SolrDispatchFilter.java:239) >> > >>> >> at >> > >>> >> org >> > >>> >> .apache >> > >>> >> .catalina >> > >>> >> .core >> > >>> >> >> > >>> > >> > >>> >> > >> .ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java: >> > >>> > >> > >>> >> 215) >> > >>> >> at >> > >>> >> org >> > >>> >> .apache >> > >>> >> .catalina >> > >>> >> >> > >>> > >> > >>> >> > >> .core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:188) >> > >>> >> at >> > >>> >> org >> > >>> >> .apache >> > >>> >> >> > >>> > >> > >>> >> > >> .catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java: >> > >>> > >> > >>> >> 210) >> > >>> >> at >> > >>> >> org >> > >>> >> .apache >> > >>> >> >> > >>> > >> > >>> >> > >> .catalina.core.StandardContextValve.invoke(StandardContextValve.java: >> > >>> > >> > >>> >> 172) >> > >>> >> at >> > >>> >> org >> > >>> >> .apache >> > >>> >> >> > >>> >> > >> .catalina.core.StandardHostValve.invoke(StandardHostValve.java:127) >> > >>> >> at >> > >>> >> org >> > >>> >> .apache >> > >>> >> >> > >>> >> > >> .catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:117) >> > >>> >> at >> > >>> >> org >> > >>> >> .apache >> > >>> >> >> > >>> >> > >> .catalina.core.StandardEngineValve.invoke(StandardEngineValve.java: >> > >>> > >> > >>> >> 108) >> > >>> >> at >> > >>> >> org >> > >>> >> >> > >>> > >> > >>> >> > >> .apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java: >> > >>> >> 151) >> > >>> >> at >> > >>> >> org >> > >>> >> >> > >>> >> > >> .apache.coyote.http11.Http11Processor.process(Http11Processor.java: >> > >>> > >> > >>> >> 870) >> > >>> >> at >> > >>> >> org.apache.coyote.http11.Http11BaseProtocol >> > >>> >> >> > >>> >> > >> $Http11ConnectionHandler.processConnection(Http11BaseProtocol.java: >> > >>> > >> > >>> >> 665) >> > >>> >> at >> > >>> >> org >> > >>> >> .apache >> > >>> >> >> > >>> > >> > >>> >> > >> .tomcat.util.net.PoolTcpEndpoint.processSocket(PoolTcpEndpoint.java: >> > >>> >> 528) >> > >>> >> at >> > >>> >> org >> > >>> >> .apache >> > >>> >> .tomcat >> > >>> >> .util >> > >>> >> .net >> > >>> >> >> > >>> > >> > >>> >> > >> .LeaderFollowerWorkerThread.runIt(LeaderFollowerWorkerThread.java:81) >> > >>> >> at >> > >>> >> org.apache.tomcat.util.threads.ThreadPool >> > >>> >> $ControlRunnable.run(ThreadPool.java:685) >> > >>> >> at java.lang.Thread.run(Thread.java:636) >> > >>> >> On Tue 22/12/09 11:02 , Toby Cole wrote:If you take out >> the >> > >>> >> fieldCollapsing/fieldCollapseCache element in your >> > >>> >> config the fieldcollapse component will not use a cache. >> > >>> >> From >> http://wiki.apache.org/solr/FieldCollapsing%2523line-63 >> > [2]" >> > >>> > >> > >>> >> > >> target="_blank">http://wiki.apache.org/solr/FieldCollapsing%23line-63 >> > >>> > [1]" >> > >>> >> >> > >>> > >> > >>> >> > >> target="_blank">http://wiki.apache.org/solr/FieldCollapsing%23line-63 >> > >>> > [3]" >> > >>> > >> > >>> >> > >> target="_blank">http://wiki.apache.org/solr/FieldCollapsing#line-63 >> > >>> >> "If the field collapse cache is not configured then the >> field >> > >>> >> collapse logic will not be cached." >> > >>> >> >> > >>> >> Regards, Toby. >> > >>> >> >> > >>> >> On 22 Dec 2009, at 10:56, wrote: >> > >>> >> >> > >>> >>> my >> > >>> >>> solconfig can be seen at >> > >>> > http://www.intelcompute.com/solrconfig.xml [4]" >> > >>> > target="_blank">http://www.intelcompute.com/solrconfig.xml >> > >>> >> [3]" >> > target="_blank">http://www.intelcompute.com/solrconfig.xml >> > >>> > [5]" >> > target="_blank">http://www.intelcompute.com/solrconfig.xml >> > >>> >>> [1] >> > >>> >>> On Tue 22/12/09 10:51 , wrote:Is >> > >>> >>> it possible to disable the field collapsing cache? I'm >> > trying >> > >>> to >> > >>> >>> perform some speed tests, and have managed to comment out >> > the >> > >>> >> filter, >> > >>> >>> queryResult, and document caches successfully. >> > >>> >>> >> > >>> >>> on 1.5 >> > >>> >>> ... >> > >>> >>> ... >> > >>> >>> collapse >> > >>> >>> >> > >>> >>> facet >> > >>> >>> >> > >>> >>> tvComponent >> > >>> >>> ... >> > >>> >>> ------------------------- >> > >>> >>> Message sent via Atmail Open - http://atmail.org/ [6]" >> > >>> > target="_blank">http://atmail.org/ [5]" >> > >>> >> target="_blank">http://atmail.org/ [7]" >> > >>> > target="_blank">http://atmail.org/ [2]" >> > >>> >>> target="_blank">http://atmail.org/ [8]" >> > >>> > target="_blank">http://atmail.org/ [6]" >> > >>> >> target="_blank">http://atmail.org/ [9]" >> > >>> > target="_blank">http://atmail.org/ >> > >>> >>> ------------------------- >> > >>> >>> Message sent via Atmail Open - http://atmail.org/ [10]" >> > >>> > target="_blank">http://atmail.org/ [7]" >> > >>> >> target="_blank">http://atmail.org/ [11]" >> > >>> > target="_blank">http://atmail.org/ >> > >>> >>> >> > >>> >>> Links: >> > >>> >>> ------ >> > >>> >>> [1] http://www.intelcompute.com/solrconfig.xml [12]" >> > >>> > target="_blank">http://www.intelcompute.com/solrconfig.xml >> > [8]" >> > >>> >> target="_blank">http://www.intelcompute.com/solrconfig.xml >> > [13]" >> > >>> > target="_blank">http://www.intelcompute.com/solrconfig.xml >> > >>> >>> [2] >> > >>> > >> > >>> >> > >> http://mail.intelcompute.com/parse.php%253Fredirect%253D%2526lt%253Ba >> > >>> > [14]" >> > >>> > >> > >>> >> > >> target="_blank">http://mail.intelcompute.com/parse.php%3Fredirect%3D%26lt%3 >> > >>> Ba>> [9]" >> > >>> >> >> > >>> > >> > >>> >> > >> target="_blank">http://mail.intelcompute.com/parse.php%3Fredirect%3Dhttp:// >> > >>> blogs.semantico.com/discovery-blog/> [15]" >> > >>> > >> > >>> >> > >> target="_blank">http://mail.intelcompute.com/parse.php?redirect=http://blog >> > >>> s.semantico.com/discovery-blog/> [16] >> > >>> >> ------------------------- >> > >>> >> Message sent via Atmail Open - http://atmail.org/ [17]" >> > >>> > target="_blank">http://atmail.org/ >> > >>> >> >> > >>> >> Links: >> > >>> >> ------ >> > >>> >> [1] >> > http://mail.intelcompute.com/parse.php%3Fredirect%3D%26lt%3Ba >> > >>> > [18]" >> > >>> > >> > target="_blank">http://mail.intelcompute.com/parse.php?redirect= >> > >>> [3] >> > >>> > >> http://mail.intelcompute.com/parse.php%3Fredirect%3D%26lt%3Ba >> > >>> [19]" >> > >>> > >> > target="_blank">http://mail.intelcompute.com/parse.php?redirect= >> > >>> [5] >> > >>> > >> http://mail.intelcompute.com/parse.php%3Fredirect%3D%26lt%3Ba >> > >>> [20]" >> > >>> > >> > target="_blank">http://mail.intelcompute.com/parse.php?redirect= >> > >>> [6] >> > >>> > >> http://mail.intelcompute.com/parse.php%3Fredirect%3D%26lt%3Ba >> > >>> [21]" >> > >>> > >> > target="_blank">http://mail.intelcompute.com/parse.php?redirect= >> > >>> [7] >> > >>> > >> http://mail.intelcompute.com/parse.php%3Fredirect%3D%26lt%3Ba >> > >>> [22]" >> > >>> > >> > target="_blank">http://mail.intelcompute.com/parse.php?redirect= >> > >>> [8] >> > >>> > >> http://mail.intelcompute.com/parse.php%3Fredirect%3D%26lt%3Ba >> > >>> [23]" >> > >>> > >> > target="_blank">http://mail.intelcompute.com/parse.php?redirect= >> > >>> [9] >> > >>> > >> http://mail.intelcompute.com/parse.php%3Fredirect%3D%26lt%3Ba >> > >>> [24]" >> > >>> > >> > target="_blank">http://mail.intelcompute.com/parse.php?redirect= >> > >>> [10] >> > >>> > >> http://mail.intelcompute.com/parse.php%3Fredirect%3D%26lt%3Ba >> > >>> [25]" >> > >>> > >> > >>> >> > >> target="_blank">http://mail.intelcompute.com/parse.php?redirect=http://blog >> > >>> s.semantico.com/discovery-blog/> ------------------------- >> > >>> > Message sent via Atmail Open - http://atmail.org/ >> > >>> > >> > >>> > Links: >> > >>> > ------ >> > >>> > [2] http://mail.intelcompute.com/parse.php?redirect= [3] >> > >>> http://mail.intelcompute.com/parse.php?redirect= [4] >> > >>> http://mail.intelcompute.com/parse.php?redirect= [5] >> > >>> http://mail.intelcompute.com/parse.php?redirect= [6] >> > >>> http://mail.intelcompute.com/parse.php?redirect= [7] >> > >>> http://mail.intelcompute.com/parse.php?redirect= [8] >> > >>> http://mail.intelcompute.com/parse.php?redirect= [9] >> > >>> http://mail.intelcompute.com/parse.php?redirect= [10] >> > >>> http://mail.intelcompute.com/parse.php?redirect= [11] >> > >>> http://mail.intelcompute.com/parse.php?redirect= [12] >> > >>> http://mail.intelcompute.com/parse.php?redirect= [13] >> > >>> http://mail.intelcompute.com/parse.php?redirect= [14] >> > >>> http://mail.intelcompute.com/parse.php?redirect= [15] >> > >>> http://mail.intelcompute.com/parse.php?redirect= [16] >> > >>> http://blogs.semantico.com/discovery-blog/ >> > >>> > [17] http://mail.intelcompute.com/parse.php?redirect= [18] >> > >>> http://mail.intelcompute.com/parse.php?redirect= [19] >> > >>> http://mail.intelcompute.com/parse.php?redirect= [20] >> > >>> http://mail.intelcompute.com/parse.php?redirect= [21] >> > >>> http://mail.intelcompute.com/parse.php?redirect= [22] >> > >>> http://mail.intelcompute.com/parse.php?redirect= [23] >> > >>> http://mail.intelcompute.com/parse.php?redirect= [24] >> > >>> http://mail.intelcompute.com/parse.php?redirect= [25] >> > >>> http://mail.intelcompute.com/parse.php?redirect= [27] >> > >>> http://mail.intelcompute.com/parse.php?redirect= >> > >>> -- >> > >>> Met vriendelijke groet, >> > >>> Martijn van Groningen >> > >>> >> > >>> >> > >> Message sent via Atmail Open - http://atmail.org/ >> > >> >> > > >> > > >> > > >> > > -- >> > > Met vriendelijke groet, >> > > >> > > Martijn van Groningen >> > > >> > -- >> > Lance Norskog >> > >> > >> Message sent via Atmail Open - http://atmail.org/ >> >> > Message sent via Atmail Open - http://atmail.org/ > -- Met vriendelijke groet, Martijn van Groningen
