Return-Path: Delivered-To: apmail-lucene-dev-archive@www.apache.org Received: (qmail 44048 invoked from network); 17 Nov 2010 11:22:22 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 17 Nov 2010 11:22:22 -0000 Received: (qmail 39369 invoked by uid 500); 17 Nov 2010 11:22:53 -0000 Delivered-To: apmail-lucene-dev-archive@lucene.apache.org Received: (qmail 39321 invoked by uid 500); 17 Nov 2010 11:22:52 -0000 Mailing-List: contact dev-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list dev@lucene.apache.org Received: (qmail 39313 invoked by uid 99); 17 Nov 2010 11:22:52 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Nov 2010 11:22:52 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.22] (HELO thor.apache.org) (140.211.11.22) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Nov 2010 11:22:49 +0000 Received: from thor (localhost [127.0.0.1]) by thor.apache.org (8.13.8+Sun/8.13.8) with ESMTP id oAHBMScs028361 for ; Wed, 17 Nov 2010 11:22:28 GMT Message-ID: <33264826.144831289992948595.JavaMail.jira@thor> Date: Wed, 17 Nov 2010 06:22:28 -0500 (EST) From: "peterwang (JIRA)" To: dev@lucene.apache.org Subject: [jira] Issue Comment Edited: (SOLR-236) Field collapsing MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-JIRA-FingerPrint: 30527f35849b9dde25b450d4833f0394 X-Virus-Checked: Checked by ClamAV on apache.org [ https://issues.apache.org/jira/browse/SOLR-236?page=3Dcom.atlassian.j= ira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=3D129329= 05#action_12932905 ]=20 peterwang edited comment on SOLR-236 at 11/17/10 6:21 AM: ---------------------------------------------------------- SOLR-236-1_4_1-paging-totals-working.patch patch failed with following erro= rs: patch: **** malformed patch at line 3348: Index: src/test/org/apache/solr/s= earch/fieldcollapse/DistributedFieldCollapsingIntegrationTest.java seems caused by hand edit (delete 6 lines without fix diff hunk number) pat= ch files, possible fix: $ diff -u SOLR-236-1_4_1.patch SOLR-236-1_4_1-paging-totals-working.patch --- SOLR-236-1_4_1.patch 2010-11-17 18:22:25.000000000 +0800 +++ SOLR-236-1_4_1-paging-totals-working.patch 2010-11-17 19:17:20.0000000= 00 +0800 @@ -2834,7 +2834,7 @@ =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- src/java/org/apache/solr/search/fieldcollapse/NonAdjacentDocumentColla= pser.java (revision ) +++ src/java/org/apache/solr/search/fieldcollapse/NonAdjacentDocumentColla= pser.java (revision ) -@@ -0,0 +1,517 @@ +@@ -0,0 +1,511 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with @@ -2939,12 +2939,6 @@ + collapseDoc =3D new NonAdjacentCollapseGroup(0, 0, documentCompar= ator, collapseThreshold, currentValue); + collapsedDocs.put(currentValue, collapseDoc); + collapsedGroupPriority.add(collapseDoc); -+ -+ if (collapsedGroupPriority.size() > maxNumberOfGroups) { -+ NonAdjacentCollapseGroup inferiorGroup =3D collapsedGroupPriori= ty.first(); -+ collapsedDocs.remove(inferiorGroup.fieldValue); -+ collapsedGroupPriority.remove(inferiorGroup); -+ } + } + // dropoutId has a value smaller than the smallest value in the que= ue and therefore it was removed from the queue + Integer dropOutId =3D (Integer) collapseDoc.priorityQueue.insertWit= hOverflow(currentId); was (Author: peterwang): SOLR-236-1_4_1-paging-totals-working.patch patch failed with following = errors: patch: **** malformed patch at line 3348: Index: src/test/org/apache/solr/s= earch/fieldcollapse/DistributedFieldCollapsingIntegrationTest.java seems caused by hand edit (delete 6 lines without fix diff hunk number) pat= ch files, possible fix: # diff -u SOLR-236-1_4_1.patch SOLR-236-1_4_1-paging-totals-working.patch --- SOLR-236-1_4_1.patch 2010-11-17 18:22:25.000000000 +0800 +++ SOLR-236-1_4_1-paging-totals-working.patch 2010-11-17 19:17:20.0000000= 00 +0800 @@ -2834,7 +2834,7 @@ =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- src/java/org/apache/solr/search/fieldcollapse/NonAdjacentDocumentColla= pser.java (revision ) +++ src/java/org/apache/solr/search/fieldcollapse/NonAdjacentDocumentColla= pser.java (revision ) -@@ -0,0 +1,517 @@ +@@ -0,0 +1,511 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with @@ -2939,12 +2939,6 @@ + collapseDoc =3D new NonAdjacentCollapseGroup(0, 0, documentCompar= ator, collapseThreshold, currentValue); + collapsedDocs.put(currentValue, collapseDoc); + collapsedGroupPriority.add(collapseDoc); -+ -+ if (collapsedGroupPriority.size() > maxNumberOfGroups) { -+ NonAdjacentCollapseGroup inferiorGroup =3D collapsedGroupPriori= ty.first(); -+ collapsedDocs.remove(inferiorGroup.fieldValue); -+ collapsedGroupPriority.remove(inferiorGroup); -+ } + } + // dropoutId has a value smaller than the smallest value in the que= ue and therefore it was removed from the queue + Integer dropOutId =3D (Integer) collapseDoc.priorityQueue.insertWit= hOverflow(currentId); =20 > Field collapsing > ---------------- > > Key: SOLR-236 > URL: https://issues.apache.org/jira/browse/SOLR-236 > Project: Solr > Issue Type: New Feature > Components: search > Affects Versions: 1.3 > Reporter: Emmanuel Keller > Assignee: Shalin Shekhar Mangar > Fix For: Next > > Attachments: collapsing-patch-to-1.3.0-dieter.patch, collapsing-p= atch-to-1.3.0-ivan.patch, collapsing-patch-to-1.3.0-ivan_2.patch, collapsin= g-patch-to-1.3.0-ivan_3.patch, DocSetScoreCollector.java, field-collapse-3.= patch, field-collapse-4-with-solrj.patch, field-collapse-5.patch, field-col= lapse-5.patch, field-collapse-5.patch, field-collapse-5.patch, field-collap= se-5.patch, field-collapse-5.patch, field-collapse-5.patch, field-collapse-= 5.patch, field-collapse-5.patch, field-collapse-5.patch, field-collapse-5.p= atch, field-collapse-5.patch, field-collapse-5.patch, field-collapse-5.patc= h, field-collapse-5.patch, field-collapse-solr-236-2.patch, field-collapse-= solr-236.patch, field-collapsing-extended-592129.patch, field_collapsing_1.= 1.0.patch, field_collapsing_1.3.patch, field_collapsing_dsteigerwald.diff, = field_collapsing_dsteigerwald.diff, field_collapsing_dsteigerwald.diff, Non= AdjacentDocumentCollapser.java, NonAdjacentDocumentCollapserTest.java, quas= idistributed.additional.patch, SOLR-236-1_4_1-paging-totals-working.patch, = SOLR-236-1_4_1.patch, SOLR-236-FieldCollapsing.patch, SOLR-236-FieldCollaps= ing.patch, SOLR-236-FieldCollapsing.patch, SOLR-236-trunk.patch, SOLR-236-t= runk.patch, SOLR-236-trunk.patch, SOLR-236-trunk.patch, SOLR-236-trunk.patc= h, SOLR-236.patch, SOLR-236.patch, SOLR-236.patch, SOLR-236.patch, SOLR-236= .patch, SOLR-236.patch, SOLR-236.patch, SOLR-236.patch, solr-236.patch, SOL= R-236_collapsing.patch, SOLR-236_collapsing.patch > > > This patch include a new feature called "Field collapsing". > "Used in order to collapse a group of results with similar value for a gi= ven field to a single entry in the result set. Site collapsing is a special= case of this, where all results for a given web site is collapsed into one= or two entries in the result set, typically with an associated "more docum= ents from this site" link. See also Duplicate detection." > http://www.fastsearch.com/glossary.aspx?m=3D48&amid=3D299 > The implementation add 3 new query parameters (SolrParams): > "collapse.field" to choose the field used to group results > "collapse.type" normal (default value) or adjacent > "collapse.max" to select how many continuous results are allowed before c= ollapsing > TODO (in progress): > - More documentation (on source code) > - Test cases > Two patches: > - "field_collapsing.patch" for current development version > - "field_collapsing_1.1.0.patch" for Solr-1.1.0 > P.S.: Feedback and misspelling correction are welcome ;-) --=20 This message is automatically generated by JIRA. - You can reply to this email to add a comment to the issue online. --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org For additional commands, e-mail: dev-help@lucene.apache.org