Updated Branches: refs/heads/0.1.5 27912aef7 -> 2546a8d93
Fixed BLUR-82. Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/2546a8d9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/2546a8d9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/2546a8d9 Branch: refs/heads/0.1.5 Commit: 2546a8d9335995e48e082333d0864bfcac3e8941 Parents: 27912ae Author: Aaron McCurry <[email protected]> Authored: Wed May 8 19:22:48 2013 -0400 Committer: Aaron McCurry <[email protected]> Committed: Wed May 8 19:22:48 2013 -0400 ---------------------------------------------------------------------- .../org/apache/blur/lucene/search/FacetQuery.java | 5 +++++ .../org/apache/blur/lucene/search/SlowQuery.java | 5 +++++ .../org/apache/blur/lucene/search/SuperQuery.java | 13 ++++++++++--- src/pom.xml | 2 +- 4 files changed, 21 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/2546a8d9/src/blur-query/src/main/java/org/apache/blur/lucene/search/FacetQuery.java ---------------------------------------------------------------------- diff --git a/src/blur-query/src/main/java/org/apache/blur/lucene/search/FacetQuery.java b/src/blur-query/src/main/java/org/apache/blur/lucene/search/FacetQuery.java index 1841fe9..06fb712 100644 --- a/src/blur-query/src/main/java/org/apache/blur/lucene/search/FacetQuery.java +++ b/src/blur-query/src/main/java/org/apache/blur/lucene/search/FacetQuery.java @@ -196,5 +196,10 @@ public class FacetQuery extends AbstractWrapperQuery { public int freq() throws IOException { return baseScorer.freq(); } + + @Override + public long cost() { + return baseScorer.cost(); + } } } http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/2546a8d9/src/blur-query/src/main/java/org/apache/blur/lucene/search/SlowQuery.java ---------------------------------------------------------------------- diff --git a/src/blur-query/src/main/java/org/apache/blur/lucene/search/SlowQuery.java b/src/blur-query/src/main/java/org/apache/blur/lucene/search/SlowQuery.java index d333e30..7ec5263 100644 --- a/src/blur-query/src/main/java/org/apache/blur/lucene/search/SlowQuery.java +++ b/src/blur-query/src/main/java/org/apache/blur/lucene/search/SlowQuery.java @@ -128,6 +128,11 @@ public class SlowQuery extends Query { return scorer.freq(); } + @Override + public long cost() { + return scorer.cost(); + } + } public static void highCpuWait(long ms) { http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/2546a8d9/src/blur-query/src/main/java/org/apache/blur/lucene/search/SuperQuery.java ---------------------------------------------------------------------- diff --git a/src/blur-query/src/main/java/org/apache/blur/lucene/search/SuperQuery.java b/src/blur-query/src/main/java/org/apache/blur/lucene/search/SuperQuery.java index 8bc01e3..f3cee51 100644 --- a/src/blur-query/src/main/java/org/apache/blur/lucene/search/SuperQuery.java +++ b/src/blur-query/src/main/java/org/apache/blur/lucene/search/SuperQuery.java @@ -48,7 +48,6 @@ public class SuperQuery extends AbstractWrapperQuery { this.scoreType = scoreType; this.primeDocTerm = primeDocTerm; } - public ScoreType getScoreType() { return scoreType; @@ -81,7 +80,7 @@ public class SuperQuery extends AbstractWrapperQuery { public String toString(String field) { return "super:<" + _query.toString(field) + ">"; } - + @Override public int hashCode() { final int prime = 31; @@ -149,7 +148,8 @@ public class SuperQuery extends AbstractWrapperQuery { } @Override - public Scorer scorer(AtomicReaderContext context, boolean scoreDocsInOrder, boolean topScorer, Bits acceptDocs) throws IOException { + public Scorer scorer(AtomicReaderContext context, boolean scoreDocsInOrder, boolean topScorer, Bits acceptDocs) + throws IOException { Scorer scorer = weight.scorer(context, true, topScorer, acceptDocs); if (scorer == null) { return null; @@ -309,6 +309,13 @@ public class SuperQuery extends AbstractWrapperQuery { public int freq() throws IOException { return scorer.freq(); } + + @Override + public long cost() { + // @TODO may be better to return the cardinality of the prime doc bitset, + // if not too costly to calculate. + return scorer.cost(); + } } public Query getQuery() { http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/2546a8d9/src/pom.xml ---------------------------------------------------------------------- diff --git a/src/pom.xml b/src/pom.xml index 9550a7c..ac23f57 100644 --- a/src/pom.xml +++ b/src/pom.xml @@ -42,7 +42,7 @@ under the License. <zookeeper.version>3.4.5</zookeeper.version> <log4j.version>1.2.15</log4j.version> <jersey.version>1.14</jersey.version> - <lucene.version>4.2.0</lucene.version> + <lucene.version>4.3.0</lucene.version> <junit.version>4.7</junit.version> <thrift.version>0.9.0</thrift.version> <slf4j.version>1.6.1</slf4j.version>
