Return-Path: X-Original-To: apmail-lucene-dev-archive@www.apache.org Delivered-To: apmail-lucene-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9C93010DC5 for ; Mon, 10 Mar 2014 22:09:59 +0000 (UTC) Received: (qmail 51957 invoked by uid 500); 10 Mar 2014 22:09:57 -0000 Delivered-To: apmail-lucene-dev-archive@lucene.apache.org Received: (qmail 51857 invoked by uid 500); 10 Mar 2014 22:09:56 -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 51850 invoked by uid 99); 10 Mar 2014 22:09:56 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Mar 2014 22:09:56 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=SPF_HELO_PASS,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: domain of uwe@thetaphi.de designates 85.25.204.22 as permitted sender) Received: from [85.25.204.22] (HELO mail.sd-datasolutions.de) (85.25.204.22) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Mar 2014 22:09:50 +0000 Received: from VEGA (unknown [IPv6:2001:1a80:2b03:7301:8e70:5aff:fed1:75a4]) by mail.sd-datasolutions.de (Postfix) with ESMTPSA id A3B9C3320002 for ; Mon, 10 Mar 2014 22:09:29 +0000 (UTC) X-NSA-Greeting: Dear NSA, have fun with reading and analyzing this e-mail! From: "Uwe Schindler" To: Subject: RE: svn commit: r1576096 - in /lucene/dev/branches/lucene5487/lucene: core/src/java/org/apache/lucene/search/ core/src/test/org/apache/lucene/search/ facet/src/java/org/apache/lucene/facet/ facet/src/java/org/apache/lucene/facet/taxonomy/ grouping/src/jav Date: Mon, 10 Mar 2014 23:09:29 +0100 Message-ID: <00fd01cf3cad$6877e390$3967aab0$@thetaphi.de> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Mailer: Microsoft Outlook 14.0 Thread-Index: AQKamVdnorbavHogVUp/dd2+DI2645lEJ9tg Content-Language: de X-Virus-Checked: Checked by ClamAV on apache.org Hi Mike, Would it not be better to have only one FakeScorer implementation in = some pkg-private class. This is too much code duplication for me! Uwe ----- Uwe Schindler H.-H.-Meier-Allee 63, D-28213 Bremen http://www.thetaphi.de eMail: uwe@thetaphi.de > -----Original Message----- > From: mikemccand@apache.org [mailto:mikemccand@apache.org] > Sent: Monday, March 10, 2014 10:42 PM > To: commits@lucene.apache.org > Subject: svn commit: r1576096 - in > /lucene/dev/branches/lucene5487/lucene: > core/src/java/org/apache/lucene/search/ > core/src/test/org/apache/lucene/search/ > facet/src/java/org/apache/lucene/facet/ > facet/src/java/org/apache/lucene/facet/taxonomy/ grouping/src/java... >=20 > Author: mikemccand > Date: Mon Mar 10 21:41:44 2014 > New Revision: 1576096 >=20 > URL: http://svn.apache.org/r1576096 > Log: > LUCENE-5487: throw OUE from FakeScorer.getWeight >=20 > Modified: >=20 > lucene/dev/branches/lucene5487/lucene/core/src/java/org/apache/lucene/ > search/BooleanScorer.java >=20 > lucene/dev/branches/lucene5487/lucene/core/src/java/org/apache/lucene/ > search/IndexSearcher.java >=20 > lucene/dev/branches/lucene5487/lucene/core/src/test/org/apache/lucene/ > search/TestBooleanScorer.java >=20 > lucene/dev/branches/lucene5487/lucene/facet/src/java/org/apache/lucene > /facet/DrillSidewaysScorer.java >=20 > lucene/dev/branches/lucene5487/lucene/facet/src/java/org/apache/lucene > /facet/taxonomy/TaxonomyFacetSumValueSource.java >=20 > lucene/dev/branches/lucene5487/lucene/grouping/src/java/org/apache/luc > ene/search/grouping/BlockGroupingCollector.java >=20 > lucene/dev/branches/lucene5487/lucene/join/src/java/org/apache/lucene/ > search/join/TermsIncludingScoreQuery.java >=20 > lucene/dev/branches/lucene5487/lucene/join/src/java/org/apache/lucene/ > search/join/ToParentBlockJoinCollector.java >=20 > Modified: > lucene/dev/branches/lucene5487/lucene/core/src/java/org/apache/lucene/ > search/BooleanScorer.java > URL: > http://svn.apache.org/viewvc/lucene/dev/branches/lucene5487/lucene/cor > = e/src/java/org/apache/lucene/search/BooleanScorer.java?rev=3D1576096&r1=3D= > 1576095&r2=3D1576096&view=3Ddiff > = =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=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > --- > lucene/dev/branches/lucene5487/lucene/core/src/java/org/apache/lucene/ > search/BooleanScorer.java (original) > +++ > lucene/dev/branches/lucene5487/lucene/core/src/java/org/apache/lucen > +++ e/search/BooleanScorer.java Mon Mar 10 21:41:44 2014 > @@ -153,6 +153,11 @@ final class BooleanScorer extends BulkSc > public long cost() { > throw new UnsupportedOperationException(); > } > + > + @Override > + public Weight getWeight() { > + throw new UnsupportedOperationException(); > + } > } >=20 > static final class Bucket { >=20 > Modified: > lucene/dev/branches/lucene5487/lucene/core/src/java/org/apache/lucene/ > search/IndexSearcher.java > URL: > http://svn.apache.org/viewvc/lucene/dev/branches/lucene5487/lucene/cor > = e/src/java/org/apache/lucene/search/IndexSearcher.java?rev=3D1576096&r1=3D= > 1576095&r2=3D1576096&view=3Ddiff > = =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=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > --- > lucene/dev/branches/lucene5487/lucene/core/src/java/org/apache/lucene/ > search/IndexSearcher.java (original) > +++ > lucene/dev/branches/lucene5487/lucene/core/src/java/org/apache/lucen > +++ e/search/IndexSearcher.java Mon Mar 10 21:41:44 2014 > @@ -805,6 +805,11 @@ public class IndexSearcher { > public long cost() { > return 1; > } > + > + @Override > + public Weight getWeight() { > + throw new UnsupportedOperationException(); > + } > } >=20 > private final FakeScorer fakeScorer =3D new FakeScorer(); >=20 > Modified: > lucene/dev/branches/lucene5487/lucene/core/src/test/org/apache/lucene/ > search/TestBooleanScorer.java > URL: > http://svn.apache.org/viewvc/lucene/dev/branches/lucene5487/lucene/cor > = e/src/test/org/apache/lucene/search/TestBooleanScorer.java?rev=3D1576096 > &r1=3D1576095&r2=3D1576096&view=3Ddiff > = =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=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > --- > lucene/dev/branches/lucene5487/lucene/core/src/test/org/apache/lucene/ > search/TestBooleanScorer.java (original) > +++ > lucene/dev/branches/lucene5487/lucene/core/src/test/org/apache/lucen > +++ e/search/TestBooleanScorer.java Mon Mar 10 21:41:44 2014 > @@ -240,6 +240,11 @@ public class TestBooleanScorer extends L > public long cost() { > throw new UnsupportedOperationException(); > } > + > + @Override > + public Weight getWeight() { > + throw new UnsupportedOperationException(); > + } > } >=20 > /** Throws UOE if Weight.scorer is called */ >=20 > Modified: > lucene/dev/branches/lucene5487/lucene/facet/src/java/org/apache/lucene > /facet/DrillSidewaysScorer.java > URL: > http://svn.apache.org/viewvc/lucene/dev/branches/lucene5487/lucene/fac > = et/src/java/org/apache/lucene/facet/DrillSidewaysScorer.java?rev=3D157609= 6 > &r1=3D1576095&r2=3D1576096&view=3Ddiff > = =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=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > --- > lucene/dev/branches/lucene5487/lucene/facet/src/java/org/apache/lucene > /facet/DrillSidewaysScorer.java (original) > +++ > lucene/dev/branches/lucene5487/lucene/facet/src/java/org/apache/luce > +++ ne/facet/DrillSidewaysScorer.java Mon Mar 10 21:41:44 2014 > @@ -661,6 +661,11 @@ class DrillSidewaysScorer extends BulkSc > public Collection getChildren() { > return Collections.singletonList(new ChildScorer(baseScorer, = "MUST")); > } > + > + @Override > + public Weight getWeight() { > + throw new UnsupportedOperationException(); > + } > } >=20 > static class DocsAndCost implements Comparable { >=20 > Modified: > lucene/dev/branches/lucene5487/lucene/facet/src/java/org/apache/lucene > /facet/taxonomy/TaxonomyFacetSumValueSource.java > URL: > http://svn.apache.org/viewvc/lucene/dev/branches/lucene5487/lucene/fac > et/src/java/org/apache/lucene/facet/taxonomy/TaxonomyFacetSumValueS > ource.java?rev=3D1576096&r1=3D1576095&r2=3D1576096&view=3Ddiff > = =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=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > --- > lucene/dev/branches/lucene5487/lucene/facet/src/java/org/apache/lucene > /facet/taxonomy/TaxonomyFacetSumValueSource.java (original) > +++ > lucene/dev/branches/lucene5487/lucene/facet/src/java/org/apache/luce > +++ ne/facet/taxonomy/TaxonomyFacetSumValueSource.java Mon Mar 10 > +++ 21:41:44 2014 > @@ -22,8 +22,8 @@ import java.util.HashMap; import java.util.List; = import > java.util.Map; >=20 > -import org.apache.lucene.facet.FacetsCollector; > import org.apache.lucene.facet.FacetsCollector.MatchingDocs; > +import org.apache.lucene.facet.FacetsCollector; > import org.apache.lucene.facet.FacetsConfig; > import org.apache.lucene.index.AtomicReaderContext; > import org.apache.lucene.queries.function.FunctionValues; > @@ -31,6 +31,7 @@ import org.apache.lucene.queries.functio import > org.apache.lucene.queries.function.docvalues.DoubleDocValues; > import org.apache.lucene.search.DocIdSetIterator; > import org.apache.lucene.search.Scorer; > +import org.apache.lucene.search.Weight; > import org.apache.lucene.util.IntsRef; >=20 > /** Aggregates sum of values from {@link @@ -70,6 +71,11 @@ public = class > TaxonomyFacetSumValueSource > @Override public int nextDoc() throws IOException { throw new > UnsupportedOperationException(); } > @Override public int advance(int target) throws IOException { = throw new > UnsupportedOperationException(); } > @Override public long cost() { return 0; } > + > + @Override > + public Weight getWeight() { > + throw new UnsupportedOperationException(); > + } > } >=20 > private final void sumValues(List matchingDocs, = boolean > keepScores, ValueSource valueSource) throws IOException { >=20 > Modified: > lucene/dev/branches/lucene5487/lucene/grouping/src/java/org/apache/luc > ene/search/grouping/BlockGroupingCollector.java > URL: > http://svn.apache.org/viewvc/lucene/dev/branches/lucene5487/lucene/gro > = uping/src/java/org/apache/lucene/search/grouping/BlockGroupingCollector. > java?rev=3D1576096&r1=3D1576095&r2=3D1576096&view=3Ddiff > = =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=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > --- > lucene/dev/branches/lucene5487/lucene/grouping/src/java/org/apache/luc > ene/search/grouping/BlockGroupingCollector.java (original) > +++ > lucene/dev/branches/lucene5487/lucene/grouping/src/java/org/apache/l > +++ ucene/search/grouping/BlockGroupingCollector.java Mon Mar 10 > +++ 21:41:44 2014 > @@ -90,7 +90,7 @@ public class BlockGroupingCollector exte > int doc; >=20 > public FakeScorer() { > - super((Weight) null); > + super(null); > } >=20 > @Override > @@ -122,6 +122,11 @@ public class BlockGroupingCollector exte > public long cost() { > return 1; > } > + > + @Override > + public Weight getWeight() { > + throw new UnsupportedOperationException(); > + } > } >=20 > private static final class OneGroup { >=20 > Modified: > lucene/dev/branches/lucene5487/lucene/join/src/java/org/apache/lucene/ > search/join/TermsIncludingScoreQuery.java > URL: > http://svn.apache.org/viewvc/lucene/dev/branches/lucene5487/lucene/joi > = n/src/java/org/apache/lucene/search/join/TermsIncludingScoreQuery.java? > rev=3D1576096&r1=3D1576095&r2=3D1576096&view=3Ddiff > = =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=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > --- > lucene/dev/branches/lucene5487/lucene/join/src/java/org/apache/lucene/ > search/join/TermsIncludingScoreQuery.java (original) > +++ > lucene/dev/branches/lucene5487/lucene/join/src/java/org/apache/lucen > +++ e/search/join/TermsIncludingScoreQuery.java Mon Mar 10 21:41:44 > 2014 > @@ -242,6 +242,11 @@ class TermsIncludingScoreQuery extends Q > public long cost() { > throw new UnsupportedOperationException(); > } > + > + @Override > + public Weight getWeight() { > + throw new UnsupportedOperationException(); > + } > } >=20 > // This impl assumes that the 'join' values are used uniquely per = doc per > field. Used for one to many relations. >=20 > Modified: > lucene/dev/branches/lucene5487/lucene/join/src/java/org/apache/lucene/ > search/join/ToParentBlockJoinCollector.java > URL: > http://svn.apache.org/viewvc/lucene/dev/branches/lucene5487/lucene/joi > = n/src/java/org/apache/lucene/search/join/ToParentBlockJoinCollector.java?= > rev=3D1576096&r1=3D1576095&r2=3D1576096&view=3Ddiff > = =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=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > --- > lucene/dev/branches/lucene5487/lucene/join/src/java/org/apache/lucene/ > search/join/ToParentBlockJoinCollector.java (original) > +++ > lucene/dev/branches/lucene5487/lucene/join/src/java/org/apache/lucen > +++ e/search/join/ToParentBlockJoinCollector.java Mon Mar 10 21:41:44 > +++ 2014 > @@ -331,7 +331,7 @@ public class ToParentBlockJoinCollector > int doc; >=20 > public FakeScorer() { > - super((Weight) null); > + super(null); > } >=20 > @Override > @@ -363,6 +363,11 @@ public class ToParentBlockJoinCollector > public long cost() { > return 1; > } > + > + @Override > + public Weight getWeight() { > + throw new UnsupportedOperationException(); > + } > } >=20 > private OneGroup[] sortedGroups; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org For additional commands, e-mail: dev-help@lucene.apache.org