You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2011/01/21 07:42:45 UTC
svn commit: r1061650 [1/2] - in /lucene/dev/branches/bulkpostings: ./
dev-tools/maven/ dev-tools/maven/lucene/ dev-tools/maven/lucene/contrib/
dev-tools/maven/lucene/contrib/ant/ dev-tools/maven/lucene/contrib/db/
dev-tools/maven/lucene/contrib/db/bdb-...
Author: rmuir
Date: Fri Jan 21 06:42:40 2011
New Revision: 1061650
URL: http://svn.apache.org/viewvc?rev=1061650&view=rev
Log:
merge trunk (1061498:1061622)
Added:
lucene/dev/branches/bulkpostings/dev-tools/maven/
- copied from r1061622, lucene/dev/trunk/dev-tools/maven/
lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/
- copied from r1061622, lucene/dev/trunk/dev-tools/maven/lucene/
lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/
- copied from r1061622, lucene/dev/trunk/dev-tools/maven/lucene/contrib/
lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/ant/
- copied from r1061622, lucene/dev/trunk/dev-tools/maven/lucene/contrib/ant/
lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/ant/pom.xml
- copied unchanged from r1061622, lucene/dev/trunk/dev-tools/maven/lucene/contrib/ant/pom.xml
lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/db/
- copied from r1061622, lucene/dev/trunk/dev-tools/maven/lucene/contrib/db/
lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/db/bdb/
- copied from r1061622, lucene/dev/trunk/dev-tools/maven/lucene/contrib/db/bdb/
lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/db/bdb-je/
- copied from r1061622, lucene/dev/trunk/dev-tools/maven/lucene/contrib/db/bdb-je/
lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/db/bdb-je/pom.xml
- copied unchanged from r1061622, lucene/dev/trunk/dev-tools/maven/lucene/contrib/db/bdb-je/pom.xml
lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/db/bdb/pom.xml
- copied unchanged from r1061622, lucene/dev/trunk/dev-tools/maven/lucene/contrib/db/bdb/pom.xml
lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/db/pom.xml
- copied unchanged from r1061622, lucene/dev/trunk/dev-tools/maven/lucene/contrib/db/pom.xml
lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/demo/
- copied from r1061622, lucene/dev/trunk/dev-tools/maven/lucene/contrib/demo/
lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/demo/pom.xml
- copied unchanged from r1061622, lucene/dev/trunk/dev-tools/maven/lucene/contrib/demo/pom.xml
lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/highlighter/
- copied from r1061622, lucene/dev/trunk/dev-tools/maven/lucene/contrib/highlighter/
lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/highlighter/pom.xml
- copied unchanged from r1061622, lucene/dev/trunk/dev-tools/maven/lucene/contrib/highlighter/pom.xml
lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/instantiated/
- copied from r1061622, lucene/dev/trunk/dev-tools/maven/lucene/contrib/instantiated/
lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/instantiated/pom.xml
- copied unchanged from r1061622, lucene/dev/trunk/dev-tools/maven/lucene/contrib/instantiated/pom.xml
lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/lucli/
- copied from r1061622, lucene/dev/trunk/dev-tools/maven/lucene/contrib/lucli/
lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/lucli/pom.xml
- copied unchanged from r1061622, lucene/dev/trunk/dev-tools/maven/lucene/contrib/lucli/pom.xml
lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/memory/
- copied from r1061622, lucene/dev/trunk/dev-tools/maven/lucene/contrib/memory/
lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/memory/pom.xml
- copied unchanged from r1061622, lucene/dev/trunk/dev-tools/maven/lucene/contrib/memory/pom.xml
lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/misc/
- copied from r1061622, lucene/dev/trunk/dev-tools/maven/lucene/contrib/misc/
lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/misc/pom.xml
- copied unchanged from r1061622, lucene/dev/trunk/dev-tools/maven/lucene/contrib/misc/pom.xml
lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/pom.xml
- copied unchanged from r1061622, lucene/dev/trunk/dev-tools/maven/lucene/contrib/pom.xml
lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/queries/
- copied from r1061622, lucene/dev/trunk/dev-tools/maven/lucene/contrib/queries/
lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/queries/pom.xml
- copied unchanged from r1061622, lucene/dev/trunk/dev-tools/maven/lucene/contrib/queries/pom.xml
lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/queryparser/
- copied from r1061622, lucene/dev/trunk/dev-tools/maven/lucene/contrib/queryparser/
lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/queryparser/pom.xml
- copied unchanged from r1061622, lucene/dev/trunk/dev-tools/maven/lucene/contrib/queryparser/pom.xml
lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/spatial/
- copied from r1061622, lucene/dev/trunk/dev-tools/maven/lucene/contrib/spatial/
lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/spatial/pom.xml
- copied unchanged from r1061622, lucene/dev/trunk/dev-tools/maven/lucene/contrib/spatial/pom.xml
lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/spellchecker/
- copied from r1061622, lucene/dev/trunk/dev-tools/maven/lucene/contrib/spellchecker/
lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/spellchecker/pom.xml
- copied unchanged from r1061622, lucene/dev/trunk/dev-tools/maven/lucene/contrib/spellchecker/pom.xml
lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/swing/
- copied from r1061622, lucene/dev/trunk/dev-tools/maven/lucene/contrib/swing/
lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/swing/pom.xml
- copied unchanged from r1061622, lucene/dev/trunk/dev-tools/maven/lucene/contrib/swing/pom.xml
lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/wordnet/
- copied from r1061622, lucene/dev/trunk/dev-tools/maven/lucene/contrib/wordnet/
lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/wordnet/pom.xml
- copied unchanged from r1061622, lucene/dev/trunk/dev-tools/maven/lucene/contrib/wordnet/pom.xml
lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/xml-query-parser/
- copied from r1061622, lucene/dev/trunk/dev-tools/maven/lucene/contrib/xml-query-parser/
lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/contrib/xml-query-parser/pom.xml
- copied unchanged from r1061622, lucene/dev/trunk/dev-tools/maven/lucene/contrib/xml-query-parser/pom.xml
lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/pom.xml
- copied unchanged from r1061622, lucene/dev/trunk/dev-tools/maven/lucene/pom.xml
lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/src/
- copied from r1061622, lucene/dev/trunk/dev-tools/maven/lucene/src/
lucene/dev/branches/bulkpostings/dev-tools/maven/lucene/src/pom.xml
- copied unchanged from r1061622, lucene/dev/trunk/dev-tools/maven/lucene/src/pom.xml
lucene/dev/branches/bulkpostings/dev-tools/maven/modules/
- copied from r1061622, lucene/dev/trunk/dev-tools/maven/modules/
lucene/dev/branches/bulkpostings/dev-tools/maven/modules/analysis/
- copied from r1061622, lucene/dev/trunk/dev-tools/maven/modules/analysis/
lucene/dev/branches/bulkpostings/dev-tools/maven/modules/analysis/common/
- copied from r1061622, lucene/dev/trunk/dev-tools/maven/modules/analysis/common/
lucene/dev/branches/bulkpostings/dev-tools/maven/modules/analysis/common/pom.xml
- copied unchanged from r1061622, lucene/dev/trunk/dev-tools/maven/modules/analysis/common/pom.xml
lucene/dev/branches/bulkpostings/dev-tools/maven/modules/analysis/icu/
- copied from r1061622, lucene/dev/trunk/dev-tools/maven/modules/analysis/icu/
lucene/dev/branches/bulkpostings/dev-tools/maven/modules/analysis/icu/pom.xml
- copied unchanged from r1061622, lucene/dev/trunk/dev-tools/maven/modules/analysis/icu/pom.xml
lucene/dev/branches/bulkpostings/dev-tools/maven/modules/analysis/phonetic/
- copied from r1061622, lucene/dev/trunk/dev-tools/maven/modules/analysis/phonetic/
lucene/dev/branches/bulkpostings/dev-tools/maven/modules/analysis/phonetic/pom.xml
- copied unchanged from r1061622, lucene/dev/trunk/dev-tools/maven/modules/analysis/phonetic/pom.xml
lucene/dev/branches/bulkpostings/dev-tools/maven/modules/analysis/pom.xml
- copied unchanged from r1061622, lucene/dev/trunk/dev-tools/maven/modules/analysis/pom.xml
lucene/dev/branches/bulkpostings/dev-tools/maven/modules/analysis/smartcn/
- copied from r1061622, lucene/dev/trunk/dev-tools/maven/modules/analysis/smartcn/
lucene/dev/branches/bulkpostings/dev-tools/maven/modules/analysis/smartcn/pom.xml
- copied unchanged from r1061622, lucene/dev/trunk/dev-tools/maven/modules/analysis/smartcn/pom.xml
lucene/dev/branches/bulkpostings/dev-tools/maven/modules/analysis/stempel/
- copied from r1061622, lucene/dev/trunk/dev-tools/maven/modules/analysis/stempel/
lucene/dev/branches/bulkpostings/dev-tools/maven/modules/analysis/stempel/pom.xml
- copied unchanged from r1061622, lucene/dev/trunk/dev-tools/maven/modules/analysis/stempel/pom.xml
lucene/dev/branches/bulkpostings/dev-tools/maven/modules/benchmark/
- copied from r1061622, lucene/dev/trunk/dev-tools/maven/modules/benchmark/
lucene/dev/branches/bulkpostings/dev-tools/maven/modules/benchmark/pom.xml
- copied unchanged from r1061622, lucene/dev/trunk/dev-tools/maven/modules/benchmark/pom.xml
lucene/dev/branches/bulkpostings/dev-tools/maven/modules/pom.xml
- copied unchanged from r1061622, lucene/dev/trunk/dev-tools/maven/modules/pom.xml
lucene/dev/branches/bulkpostings/dev-tools/maven/pom.xml
- copied unchanged from r1061622, lucene/dev/trunk/dev-tools/maven/pom.xml
lucene/dev/branches/bulkpostings/dev-tools/maven/solr/
- copied from r1061622, lucene/dev/trunk/dev-tools/maven/solr/
lucene/dev/branches/bulkpostings/dev-tools/maven/solr/contrib/
- copied from r1061622, lucene/dev/trunk/dev-tools/maven/solr/contrib/
lucene/dev/branches/bulkpostings/dev-tools/maven/solr/contrib/analysis-extras/
- copied from r1061622, lucene/dev/trunk/dev-tools/maven/solr/contrib/analysis-extras/
lucene/dev/branches/bulkpostings/dev-tools/maven/solr/contrib/analysis-extras/pom.xml
- copied unchanged from r1061622, lucene/dev/trunk/dev-tools/maven/solr/contrib/analysis-extras/pom.xml
lucene/dev/branches/bulkpostings/dev-tools/maven/solr/contrib/clustering/
- copied from r1061622, lucene/dev/trunk/dev-tools/maven/solr/contrib/clustering/
lucene/dev/branches/bulkpostings/dev-tools/maven/solr/contrib/clustering/pom.xml
- copied unchanged from r1061622, lucene/dev/trunk/dev-tools/maven/solr/contrib/clustering/pom.xml
lucene/dev/branches/bulkpostings/dev-tools/maven/solr/contrib/dataimporthandler/
- copied from r1061622, lucene/dev/trunk/dev-tools/maven/solr/contrib/dataimporthandler/
lucene/dev/branches/bulkpostings/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml
- copied unchanged from r1061622, lucene/dev/trunk/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml
lucene/dev/branches/bulkpostings/dev-tools/maven/solr/contrib/dataimporthandler/src/
- copied from r1061622, lucene/dev/trunk/dev-tools/maven/solr/contrib/dataimporthandler/src/
lucene/dev/branches/bulkpostings/dev-tools/maven/solr/contrib/dataimporthandler/src/extras/
- copied from r1061622, lucene/dev/trunk/dev-tools/maven/solr/contrib/dataimporthandler/src/extras/
lucene/dev/branches/bulkpostings/dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml
- copied unchanged from r1061622, lucene/dev/trunk/dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml
lucene/dev/branches/bulkpostings/dev-tools/maven/solr/contrib/dataimporthandler/src/pom.xml
- copied unchanged from r1061622, lucene/dev/trunk/dev-tools/maven/solr/contrib/dataimporthandler/src/pom.xml
lucene/dev/branches/bulkpostings/dev-tools/maven/solr/contrib/extraction/
- copied from r1061622, lucene/dev/trunk/dev-tools/maven/solr/contrib/extraction/
lucene/dev/branches/bulkpostings/dev-tools/maven/solr/contrib/extraction/pom.xml
- copied unchanged from r1061622, lucene/dev/trunk/dev-tools/maven/solr/contrib/extraction/pom.xml
lucene/dev/branches/bulkpostings/dev-tools/maven/solr/contrib/pom.xml
- copied unchanged from r1061622, lucene/dev/trunk/dev-tools/maven/solr/contrib/pom.xml
lucene/dev/branches/bulkpostings/dev-tools/maven/solr/pom.xml
- copied unchanged from r1061622, lucene/dev/trunk/dev-tools/maven/solr/pom.xml
lucene/dev/branches/bulkpostings/dev-tools/maven/solr/src/
- copied from r1061622, lucene/dev/trunk/dev-tools/maven/solr/src/
lucene/dev/branches/bulkpostings/dev-tools/maven/solr/src/pom.xml
- copied unchanged from r1061622, lucene/dev/trunk/dev-tools/maven/solr/src/pom.xml
lucene/dev/branches/bulkpostings/dev-tools/maven/solr/src/solrj/
- copied from r1061622, lucene/dev/trunk/dev-tools/maven/solr/src/solrj/
lucene/dev/branches/bulkpostings/dev-tools/maven/solr/src/solrj/pom.xml
- copied unchanged from r1061622, lucene/dev/trunk/dev-tools/maven/solr/src/solrj/pom.xml
lucene/dev/branches/bulkpostings/dev-tools/maven/solr/src/webapp/
- copied from r1061622, lucene/dev/trunk/dev-tools/maven/solr/src/webapp/
lucene/dev/branches/bulkpostings/dev-tools/maven/solr/src/webapp/pom.xml
- copied unchanged from r1061622, lucene/dev/trunk/dev-tools/maven/solr/src/webapp/pom.xml
Removed:
lucene/dev/branches/bulkpostings/lucene/contrib/ant/pom.xml.template
lucene/dev/branches/bulkpostings/lucene/contrib/db/bdb-je/pom.xml.template
lucene/dev/branches/bulkpostings/lucene/contrib/db/bdb/pom.xml.template
lucene/dev/branches/bulkpostings/lucene/contrib/highlighter/pom.xml.template
lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/pom.xml.template
lucene/dev/branches/bulkpostings/lucene/contrib/lucli/pom.xml.template
lucene/dev/branches/bulkpostings/lucene/contrib/memory/pom.xml.template
lucene/dev/branches/bulkpostings/lucene/contrib/misc/pom.xml.template
lucene/dev/branches/bulkpostings/lucene/contrib/queries/pom.xml.template
lucene/dev/branches/bulkpostings/lucene/contrib/queryparser/pom.xml.template
lucene/dev/branches/bulkpostings/lucene/contrib/spatial/pom.xml.template
lucene/dev/branches/bulkpostings/lucene/contrib/spellchecker/pom.xml.template
lucene/dev/branches/bulkpostings/lucene/contrib/swing/pom.xml.template
lucene/dev/branches/bulkpostings/lucene/contrib/wordnet/pom.xml.template
lucene/dev/branches/bulkpostings/lucene/contrib/xml-query-parser/pom.xml.template
lucene/dev/branches/bulkpostings/lucene/lucene-contrib-pom.xml.template
lucene/dev/branches/bulkpostings/lucene/lucene-core-pom.xml.template
lucene/dev/branches/bulkpostings/lucene/lucene-demos-pom.xml.template
lucene/dev/branches/bulkpostings/lucene/lucene-parent-pom.xml.template
lucene/dev/branches/bulkpostings/modules/analysis/common/pom.xml.template
lucene/dev/branches/bulkpostings/modules/analysis/icu/pom.xml.template
lucene/dev/branches/bulkpostings/modules/analysis/phonetic/pom.xml.template
lucene/dev/branches/bulkpostings/modules/analysis/smartcn/pom.xml.template
lucene/dev/branches/bulkpostings/modules/analysis/stempel/pom.xml.template
lucene/dev/branches/bulkpostings/modules/benchmark/pom.xml.template
lucene/dev/branches/bulkpostings/solr/contrib/clustering/solr-clustering-pom.xml.template
lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/solr-dataimporthandler-extras-pom.xml.template
lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/solr-dataimporthandler-pom.xml.template
lucene/dev/branches/bulkpostings/solr/contrib/extraction/solr-cell-pom.xml.template
lucene/dev/branches/bulkpostings/solr/src/maven/
Modified:
lucene/dev/branches/bulkpostings/ (props changed)
lucene/dev/branches/bulkpostings/build.xml
lucene/dev/branches/bulkpostings/lucene/ (props changed)
lucene/dev/branches/bulkpostings/lucene/CHANGES.txt
lucene/dev/branches/bulkpostings/lucene/MIGRATE.txt
lucene/dev/branches/bulkpostings/lucene/build.xml
lucene/dev/branches/bulkpostings/lucene/common-build.xml
lucene/dev/branches/bulkpostings/lucene/contrib/ (props changed)
lucene/dev/branches/bulkpostings/lucene/contrib/ant/ (props changed)
lucene/dev/branches/bulkpostings/lucene/contrib/contrib-build.xml
lucene/dev/branches/bulkpostings/lucene/contrib/db/ (props changed)
lucene/dev/branches/bulkpostings/lucene/contrib/db/bdb/ (props changed)
lucene/dev/branches/bulkpostings/lucene/contrib/db/bdb-je/ (props changed)
lucene/dev/branches/bulkpostings/lucene/contrib/demo/ (props changed)
lucene/dev/branches/bulkpostings/lucene/contrib/demo/build.xml
lucene/dev/branches/bulkpostings/lucene/contrib/highlighter/ (props changed)
lucene/dev/branches/bulkpostings/lucene/contrib/instantiated/ (props changed)
lucene/dev/branches/bulkpostings/lucene/contrib/lucli/ (props changed)
lucene/dev/branches/bulkpostings/lucene/contrib/memory/ (props changed)
lucene/dev/branches/bulkpostings/lucene/contrib/misc/ (props changed)
lucene/dev/branches/bulkpostings/lucene/contrib/queries/ (props changed)
lucene/dev/branches/bulkpostings/lucene/contrib/queryparser/ (props changed)
lucene/dev/branches/bulkpostings/lucene/contrib/spatial/ (props changed)
lucene/dev/branches/bulkpostings/lucene/contrib/spellchecker/ (props changed)
lucene/dev/branches/bulkpostings/lucene/contrib/swing/ (props changed)
lucene/dev/branches/bulkpostings/lucene/contrib/wordnet/ (props changed)
lucene/dev/branches/bulkpostings/lucene/contrib/xml-query-parser/ (props changed)
lucene/dev/branches/bulkpostings/lucene/src/ (props changed)
lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/BooleanScorer.java
lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/BooleanScorer2.java
lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/ConjunctionScorer.java
lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/ConstantScoreQuery.java
lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/DisjunctionMaxQuery.java
lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/DisjunctionMaxScorer.java
lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/DisjunctionSumScorer.java
lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/ExactPhraseScorer.java
lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/FilteredQuery.java
lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/MatchAllDocsQuery.java
lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/MatchOnlyTermScorer.java
lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/PhraseScorer.java
lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/ReqExclScorer.java
lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/ReqOptSumScorer.java
lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/ScoreCachingWrappingScorer.java
lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/Scorer.java
lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/SloppyPhraseScorer.java
lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/TermScorer.java
lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/function/CustomScoreQuery.java
lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/function/ValueSourceQuery.java
lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/payloads/PayloadNearQuery.java
lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/payloads/PayloadTermQuery.java
lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/spans/FieldMaskingSpanQuery.java
lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/spans/SpanScorer.java
lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/store/BufferedIndexInput.java
lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/search/JustCompileSearch.java
lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/search/TestBooleanScorer.java
lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/search/TestPositiveScoresOnlyCollector.java
lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/search/TestScoreCachingWrappingScorer.java
lucene/dev/branches/bulkpostings/modules/ (props changed)
lucene/dev/branches/bulkpostings/modules/analysis/ (props changed)
lucene/dev/branches/bulkpostings/modules/analysis/common/ (props changed)
lucene/dev/branches/bulkpostings/modules/analysis/icu/ (props changed)
lucene/dev/branches/bulkpostings/modules/analysis/phonetic/ (props changed)
lucene/dev/branches/bulkpostings/modules/analysis/smartcn/ (props changed)
lucene/dev/branches/bulkpostings/modules/analysis/stempel/ (props changed)
lucene/dev/branches/bulkpostings/modules/benchmark/ (props changed)
lucene/dev/branches/bulkpostings/modules/benchmark/build.xml
lucene/dev/branches/bulkpostings/modules/build.xml
lucene/dev/branches/bulkpostings/solr/ (props changed)
lucene/dev/branches/bulkpostings/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/bulkpostings/solr/KEYS (props changed)
lucene/dev/branches/bulkpostings/solr/LICENSE.txt (props changed)
lucene/dev/branches/bulkpostings/solr/NOTICE.txt (props changed)
lucene/dev/branches/bulkpostings/solr/README.txt (props changed)
lucene/dev/branches/bulkpostings/solr/build.xml (contents, props changed)
lucene/dev/branches/bulkpostings/solr/client/ (props changed)
lucene/dev/branches/bulkpostings/solr/common-build.xml (contents, props changed)
lucene/dev/branches/bulkpostings/solr/contrib/ (props changed)
lucene/dev/branches/bulkpostings/solr/contrib/analysis-extras/ (props changed)
lucene/dev/branches/bulkpostings/solr/contrib/clustering/ (props changed)
lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/ (props changed)
lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/ (props changed)
lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/extras/ (props changed)
lucene/dev/branches/bulkpostings/solr/contrib/extraction/ (props changed)
lucene/dev/branches/bulkpostings/solr/example/ (props changed)
lucene/dev/branches/bulkpostings/solr/lib/ (props changed)
lucene/dev/branches/bulkpostings/solr/site/ (props changed)
lucene/dev/branches/bulkpostings/solr/src/ (props changed)
lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/LatLonType.java
lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/SolrConstantScoreQuery.java
lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/BoostedQuery.java
lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/FunctionQuery.java
lucene/dev/branches/bulkpostings/solr/src/solrj/ (props changed)
lucene/dev/branches/bulkpostings/solr/src/webapp/ (props changed)
lucene/dev/branches/bulkpostings/solr/testlogging.properties (props changed)
Modified: lucene/dev/branches/bulkpostings/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/build.xml?rev=1061650&r1=1061649&r2=1061650&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/build.xml (original)
+++ lucene/dev/branches/bulkpostings/build.xml Fri Jan 21 06:42:40 2011
@@ -38,6 +38,13 @@
</sequential>
</target>
+ <target name="get-maven-poms"
+ description="Copy Maven POMs from dev-tools/maven/ to their target locations">
+ <copy todir=".">
+ <fileset dir="${basedir}/dev-tools/maven"/>
+ </copy>
+ </target>
+
<target name="generate-maven-artifacts" description="Generate Maven Artifacts for Lucene and Solr">
<property name="maven.dist.dir" location="dist/maven" />
<mkdir dir="${maven.dist.dir}" />
Modified: lucene/dev/branches/bulkpostings/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/CHANGES.txt?rev=1061650&r1=1061649&r2=1061650&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/bulkpostings/lucene/CHANGES.txt Fri Jan 21 06:42:40 2011
@@ -613,6 +613,11 @@ API Changes
for AttributeImpls, but can still be provided (if needed).
(Uwe Schindler)
+* LUCENE-2876: Deprecated Scorer.getSimilarity(). If your Scorer uses a Similarity,
+ it should keep it itself. Fixed Scorers to pass their parent Weight, so that
+ Scorer.visitSubScorers (LUCENE-2590) will work correctly.
+ (Robert Muir, Doron Cohen)
+
Bug fixes
* LUCENE-2249: ParallelMultiSearcher should shut down thread pool on
@@ -875,6 +880,9 @@ Optimizations
DirectoryReaders or other MultiReaders. This saves lots of memory
during merge of norms. (Uwe Schindler, Mike McCandless)
+* LUCENE-2824: Optimize BufferedIndexInput to do less bounds checks.
+ (Robert Muir)
+
Build
* LUCENE-2124: Moved the JDK-based collation support from contrib/collation
@@ -902,6 +910,9 @@ Build
"ant idea". See http://wiki.apache.org/lucene-java/HowtoConfigureIntelliJ
(Steven Rowe)
+* LUCENE-2657: Switch from using Maven POM templates to full POMs when
+ generating Maven artifacts (Steven Rowe)
+
Test Cases
* LUCENE-2037 Allow Junit4 tests in our environment (Erick Erickson
Modified: lucene/dev/branches/bulkpostings/lucene/MIGRATE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/MIGRATE.txt?rev=1061650&r1=1061649&r2=1061650&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/MIGRATE.txt (original)
+++ lucene/dev/branches/bulkpostings/lucene/MIGRATE.txt Fri Jan 21 06:42:40 2011
@@ -325,10 +325,6 @@ LUCENE-1458, LUCENE-2111: Flexible Index
global AttributeSource to each segments TermsEnum. The TermsEnum is consumer
and gets the current minimum competitive boosts (MTQ.MaxNonCompetitiveBoostAttribute).
-* LUCENE-2761: DataInput.readVInt/readVLong and DataOutput.writeVInt/writeVLong
- are final. If you subclassed this code before to encode variable-length
- integers in some specialized way, use the Codec API instead.
-
* LUCENE-2374: The backwards layer in AttributeImpl was removed. To support correct
reflection of AttributeImpl instances, where the reflection was done using deprecated
toString() parsing, you have to now override reflectWith() to customize output.
Modified: lucene/dev/branches/bulkpostings/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/build.xml?rev=1061650&r1=1061649&r2=1061650&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/build.xml (original)
+++ lucene/dev/branches/bulkpostings/lucene/build.xml Fri Jan 21 06:42:40 2011
@@ -391,8 +391,11 @@
<target name="generate-maven-artifacts" depends="maven.ant.tasks-check, package, jar-src, javadocs">
<sequential>
- <m2-deploy pom.xml="lucene-parent-pom.xml.template"/>
- <m2-deploy pom.xml="lucene-core-pom.xml.template">
+ <ant target="get-maven-poms" inheritAll="false" dir=".."/>
+
+ <m2-deploy pom.xml="../pom.xml"/> <!-- Lucene/Solr grandparent POM -->
+ <m2-deploy pom.xml="pom.xml"/> <!-- Lucene parent POM -->
+ <m2-deploy pom.xml="src/pom.xml"> <!-- Lucene core POM -->
<artifact-attachments>
<attach file="${build.dir}/${final.name}-src.jar"
classifier="sources"/>
@@ -400,8 +403,6 @@
classifier="javadoc"/>
</artifact-attachments>
</m2-deploy>
-
- <m2-deploy pom.xml="lucene-contrib-pom.xml.template"/>
<contrib-crawl target="dist-maven"/>
</sequential>
</target>
Modified: lucene/dev/branches/bulkpostings/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/common-build.xml?rev=1061650&r1=1061649&r2=1061650&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/common-build.xml (original)
+++ lucene/dev/branches/bulkpostings/lucene/common-build.xml Fri Jan 21 06:42:40 2011
@@ -318,32 +318,22 @@
</fail>
</target>
- <property name="pom.xml" value="pom.xml.template"/>
-
<macrodef name="m2-deploy" description="Builds a Maven artifact">
<element name="artifact-attachments" optional="yes"/>
- <attribute name="pom.xml" default="${pom.xml}"/>
+ <attribute name="pom.xml" default="pom.xml"/>
<sequential>
- <copy file="@{pom.xml}" tofile="${build.dir}/@{pom.xml}">
- <filterset begintoken="@" endtoken="@">
- <filter token="version" value="${version}"/>
- </filterset>
- </copy>
- <artifact:install-provider artifactId="wagon-ssh" version="1.0-beta-2"/>
-
- <artifact:pom id="maven.project" file="${build.dir}/@{pom.xml}" />
+ <artifact:install-provider artifactId="wagon-ssh" version="1.0-beta-7"/>
+ <artifact:pom id="maven.project" file="@{pom.xml}"/>
<artifact:deploy file="${build.dir}/${maven.project.build.finalName}.jar">
<artifact-attachments/>
<remoteRepository url="${m2.repository.url}">
<authentication username="${m2.repository.username}" privateKey="${m2.repository.private.key}"/>
- </remoteRepository>
+ </remoteRepository>
<pom refid="maven.project"/>
</artifact:deploy>
</sequential>
</macrodef>
-
-
<macrodef name="build-manifest" description="Builds a manifest file">
<attribute name="title" default="Lucene Search Engine: ${ant.project.name}" />
<sequential>
Modified: lucene/dev/branches/bulkpostings/lucene/contrib/contrib-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/contrib/contrib-build.xml?rev=1061650&r1=1061649&r2=1061650&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/contrib/contrib-build.xml (original)
+++ lucene/dev/branches/bulkpostings/lucene/contrib/contrib-build.xml Fri Jan 21 06:42:40 2011
@@ -71,7 +71,7 @@
<available
type="file"
- file="${pom.xml}"
+ file="pom.xml"
property="pom.xml.present">
</available>
Modified: lucene/dev/branches/bulkpostings/lucene/contrib/demo/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/contrib/demo/build.xml?rev=1061650&r1=1061649&r2=1061650&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/contrib/demo/build.xml (original)
+++ lucene/dev/branches/bulkpostings/lucene/contrib/demo/build.xml Fri Jan 21 06:42:40 2011
@@ -17,7 +17,7 @@
limitations under the License.
-->
-<project name="demo" default="default">
+<project name="demo" default="default" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
<description>
Lucene Demo
@@ -75,4 +75,23 @@
outputDir="src/java/org/apache/lucene/demo/html"
/>
</target>
+
+ <target name="dist-maven" if="pom.xml.present" depends="compile-core,jar-src">
+ <sequential>
+ <artifact:install-provider artifactId="wagon-ssh" version="1.0-beta-7"/>
+ <artifact:pom id="maven.project" file="pom.xml"/>
+ <artifact:deploy file="${build.dir}/${demo.war.name}.war">
+ <attach file="${build.dir}/${maven.project.build.finalName}.jar"
+ classifier="classes"/>
+ <attach file="${build.dir}/${final.name}-src.jar"
+ classifier="sources"/>
+ <attach file="${build.dir}/${final.name}-javadoc.jar"
+ classifier="javadoc"/>
+ <remoteRepository url="${m2.repository.url}">
+ <authentication username="${m2.repository.username}" privateKey="${m2.repository.private.key}"/>
+ </remoteRepository>
+ <pom refid="maven.project"/>
+ </artifact:deploy>
+ </sequential>
+ </target>
</project>
Modified: lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/BooleanScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/BooleanScorer.java?rev=1061650&r1=1061649&r2=1061650&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/BooleanScorer.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/BooleanScorer.java Fri Jan 21 06:42:40 2011
@@ -119,7 +119,7 @@ final class BooleanScorer extends Scorer
int doc = NO_MORE_DOCS;
int freq;
- public BucketScorer() { super(null); }
+ public BucketScorer(Weight weight) { super(weight); }
@Override
public int advance(int target) throws IOException { return NO_MORE_DOCS; }
@@ -200,7 +200,7 @@ final class BooleanScorer extends Scorer
BooleanScorer(BooleanWeight weight, boolean disableCoord, int minNrShouldMatch,
List<Scorer> optionalScorers, List<Scorer> prohibitedScorers, int maxCoord) throws IOException {
- super(null, weight); // Similarity not used
+ super(weight);
this.minNrShouldMatch = minNrShouldMatch;
if (optionalScorers != null && optionalScorers.size() > 0) {
@@ -233,7 +233,7 @@ final class BooleanScorer extends Scorer
public boolean score(Collector collector, int max, int firstDocID) throws IOException {
boolean more;
Bucket tmp;
- BucketScorer bs = new BucketScorer();
+ BucketScorer bs = new BucketScorer(weight);
// The internal loop will set the score and doc before calling collect.
collector.setScorer(bs);
do {
Modified: lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/BooleanScorer2.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/BooleanScorer2.java?rev=1061650&r1=1061649&r2=1061650&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/BooleanScorer2.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/BooleanScorer2.java Fri Jan 21 06:42:40 2011
@@ -68,8 +68,11 @@ class BooleanScorer2 extends Scorer {
* prohibited and optional scorers. In no required scorers are added, at least
* one of the optional scorers will have to match during the search.
*
- * @param similarity
- * The similarity to be used.
+ * @param weight
+ * The BooleanWeight to be used.
+ * @param disableCoord
+ * If this parameter is true, coordination level matching
+ * ({@link Similarity#coord(int, int)}) is not used.
* @param minNrShouldMatch
* The minimum number of optional added scorers that should match
* during the search. In case no required scorers are added, at least
@@ -83,7 +86,7 @@ class BooleanScorer2 extends Scorer {
*/
public BooleanScorer2(BooleanWeight weight, boolean disableCoord, int minNrShouldMatch,
List<Scorer> required, List<Scorer> prohibited, List<Scorer> optional, int maxCoord) throws IOException {
- super(null, weight); // Similarity not used
+ super(weight);
if (minNrShouldMatch < 0) {
throw new IllegalArgumentException("Minimum number of optional scorers should not be negative");
}
@@ -108,7 +111,7 @@ class BooleanScorer2 extends Scorer {
private float lastDocScore = Float.NaN;
SingleMatchScorer(Scorer scorer) {
- super(null); // No similarity used.
+ super(scorer.weight);
this.scorer = scorer;
}
@@ -144,7 +147,7 @@ class BooleanScorer2 extends Scorer {
private Scorer countingDisjunctionSumScorer(final List<Scorer> scorers,
int minNrShouldMatch) throws IOException {
// each scorer from the list counted as a single matcher
- return new DisjunctionSumScorer(scorers, minNrShouldMatch) {
+ return new DisjunctionSumScorer(weight, scorers, minNrShouldMatch) {
private int lastScoredDoc = -1;
// Save the score of lastScoredDoc, so that we don't compute it more than
// once in score().
@@ -167,7 +170,7 @@ class BooleanScorer2 extends Scorer {
List<Scorer> requiredScorers) throws IOException {
// each scorer from the list counted as a single matcher
final int requiredNrMatchers = requiredScorers.size();
- return new ConjunctionScorer(disableCoord ? 1.0f : ((BooleanWeight)weight).coord(requiredScorers.size(), requiredScorers.size()), requiredScorers) {
+ return new ConjunctionScorer(weight, disableCoord ? 1.0f : ((BooleanWeight)weight).coord(requiredScorers.size(), requiredScorers.size()), requiredScorers) {
private int lastScoredDoc = -1;
// Save the score of lastScoredDoc, so that we don't compute it more than
// once in score().
@@ -192,7 +195,7 @@ class BooleanScorer2 extends Scorer {
private Scorer dualConjunctionSumScorer(boolean disableCoord,
Scorer req1, Scorer req2) throws IOException { // non counting.
- return new ConjunctionScorer(disableCoord ? 1.0f : ((BooleanWeight)weight).coord(2, 2), req1, req2);
+ return new ConjunctionScorer(weight, disableCoord ? 1.0f : ((BooleanWeight)weight).coord(2, 2), req1, req2);
// All scorers match, so defaultSimilarity always has 1 as
// the coordination factor.
// Therefore the sum of the scores of two scorers
@@ -262,7 +265,7 @@ class BooleanScorer2 extends Scorer {
: new ReqExclScorer(requiredCountingSumScorer,
((prohibitedScorers.size() == 1)
? prohibitedScorers.get(0)
- : new DisjunctionSumScorer(prohibitedScorers)));
+ : new DisjunctionSumScorer(weight, prohibitedScorers)));
}
/** Scores and collects all matching documents.
Modified: lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/ConjunctionScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/ConjunctionScorer.java?rev=1061650&r1=1061649&r2=1061650&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/ConjunctionScorer.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/ConjunctionScorer.java Fri Jan 21 06:42:40 2011
@@ -29,12 +29,12 @@ class ConjunctionScorer extends Scorer {
private final float coord;
private int lastDoc = -1;
- public ConjunctionScorer(float coord, Collection<Scorer> scorers) throws IOException {
- this(coord, scorers.toArray(new Scorer[scorers.size()]));
+ public ConjunctionScorer(Weight weight, float coord, Collection<Scorer> scorers) throws IOException {
+ this(weight, coord, scorers.toArray(new Scorer[scorers.size()]));
}
- public ConjunctionScorer(float coord, Scorer... scorers) throws IOException {
- super(null);
+ public ConjunctionScorer(Weight weight, float coord, Scorer... scorers) throws IOException {
+ super(weight);
this.scorers = scorers;
this.coord = coord;
Modified: lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/ConstantScoreQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/ConstantScoreQuery.java?rev=1061650&r1=1061649&r2=1061650&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/ConstantScoreQuery.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/ConstantScoreQuery.java Fri Jan 21 06:42:40 2011
@@ -97,12 +97,10 @@ public class ConstantScoreQuery extends
protected class ConstantWeight extends Weight {
private final Weight innerWeight;
- private final Similarity similarity;
private float queryNorm;
private float queryWeight;
public ConstantWeight(IndexSearcher searcher) throws IOException {
- this.similarity = searcher.getSimilarity();
this.innerWeight = (query == null) ? null : query.createWeight(searcher);
}
@@ -148,7 +146,7 @@ public class ConstantScoreQuery extends
}
if (disi == null)
return null;
- return new ConstantScorer(similarity, disi, this);
+ return new ConstantScorer(disi, this);
}
@Override
@@ -181,8 +179,8 @@ public class ConstantScoreQuery extends
final DocIdSetIterator docIdSetIterator;
final float theScore;
- public ConstantScorer(Similarity similarity, DocIdSetIterator docIdSetIterator, Weight w) throws IOException {
- super(similarity,w);
+ public ConstantScorer(DocIdSetIterator docIdSetIterator, Weight w) throws IOException {
+ super(w);
theScore = w.getValue();
this.docIdSetIterator = docIdSetIterator;
}
@@ -217,8 +215,7 @@ public class ConstantScoreQuery extends
@Override
public void setScorer(Scorer scorer) throws IOException {
// we must wrap again here, but using the scorer passed in as parameter:
- collector.setScorer(new ConstantScorer(ConstantScorer.this.getSimilarity(),
- scorer, ConstantScorer.this.weight));
+ collector.setScorer(new ConstantScorer(scorer, ConstantScorer.this.weight));
}
@Override
Modified: lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/DisjunctionMaxQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/DisjunctionMaxQuery.java?rev=1061650&r1=1061649&r2=1061650&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/DisjunctionMaxQuery.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/DisjunctionMaxQuery.java Fri Jan 21 06:42:40 2011
@@ -95,29 +95,26 @@ public class DisjunctionMaxQuery extends
* change suddenly in the next release.</p>
*/
protected class DisjunctionMaxWeight extends Weight {
- /** The Similarity implementation. */
- protected Similarity similarity;
/** The Weights for our subqueries, in 1-1 correspondence with disjuncts */
protected ArrayList<Weight> weights = new ArrayList<Weight>(); // The Weight's for our subqueries, in 1-1 correspondence with disjuncts
- /* Construct the Weight for this Query searched by searcher. Recursively construct subquery weights. */
+ /** Construct the Weight for this Query searched by searcher. Recursively construct subquery weights. */
public DisjunctionMaxWeight(IndexSearcher searcher) throws IOException {
- this.similarity = searcher.getSimilarity();
for (Query disjunctQuery : disjuncts) {
weights.add(disjunctQuery.createWeight(searcher));
}
}
- /* Return our associated DisjunctionMaxQuery */
+ /** Return our associated DisjunctionMaxQuery */
@Override
public Query getQuery() { return DisjunctionMaxQuery.this; }
- /* Return our boost */
+ /** Return our boost */
@Override
public float getValue() { return getBoost(); }
- /* Compute the sub of squared weights of us applied to our subqueries. Used for normalization. */
+ /** Compute the sub of squared weights of us applied to our subqueries. Used for normalization. */
@Override
public float sumOfSquaredWeights() throws IOException {
float max = 0.0f, sum = 0.0f;
@@ -131,7 +128,7 @@ public class DisjunctionMaxQuery extends
return (((sum - max) * tieBreakerMultiplier * tieBreakerMultiplier) + max) * boost * boost;
}
- /* Apply the computed normalization factor to our subqueries */
+ /** Apply the computed normalization factor to our subqueries */
@Override
public void normalize(float norm) {
norm *= getBoost(); // Incorporate our boost
@@ -140,7 +137,7 @@ public class DisjunctionMaxQuery extends
}
}
- /* Create the scorer used to score our associated DisjunctionMaxQuery */
+ /** Create the scorer used to score our associated DisjunctionMaxQuery */
@Override
public Scorer scorer(AtomicReaderContext context, ScorerContext scorerContext) throws IOException {
Scorer[] scorers = new Scorer[weights.size()];
@@ -152,11 +149,11 @@ public class DisjunctionMaxQuery extends
}
}
if (idx == 0) return null; // all scorers did not have documents
- DisjunctionMaxScorer result = new DisjunctionMaxScorer(tieBreakerMultiplier, similarity, scorers, idx);
+ DisjunctionMaxScorer result = new DisjunctionMaxScorer(this, tieBreakerMultiplier, scorers, idx);
return result;
}
- /* Explain the score we computed for doc */
+ /** Explain the score we computed for doc */
@Override
public Explanation explain(AtomicReaderContext context, int doc) throws IOException {
if (disjuncts.size() == 1) return weights.get(0).explain(context,doc);
@@ -178,7 +175,7 @@ public class DisjunctionMaxQuery extends
} // end of DisjunctionMaxWeight inner class
- /* Create the Weight used to score us */
+ /** Create the Weight used to score us */
@Override
public Weight createWeight(IndexSearcher searcher) throws IOException {
return new DisjunctionMaxWeight(searcher);
Modified: lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/DisjunctionMaxScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/DisjunctionMaxScorer.java?rev=1061650&r1=1061649&r2=1061650&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/DisjunctionMaxScorer.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/DisjunctionMaxScorer.java Fri Jan 21 06:42:40 2011
@@ -40,22 +40,20 @@ class DisjunctionMaxScorer extends Score
/**
* Creates a new instance of DisjunctionMaxScorer
*
+ * @param weight
+ * The Weight to be used.
* @param tieBreakerMultiplier
* Multiplier applied to non-maximum-scoring subqueries for a
* document as they are summed into the result.
- * @param similarity
- * -- not used since our definition involves neither coord nor terms
- * directly
* @param subScorers
* The sub scorers this Scorer should iterate on
* @param numScorers
* The actual number of scorers to iterate on. Note that the array's
* length may be larger than the actual number of scorers.
*/
- public DisjunctionMaxScorer(float tieBreakerMultiplier,
- Similarity similarity, Scorer[] subScorers, int numScorers) throws IOException {
- super(similarity);
-
+ public DisjunctionMaxScorer(Weight weight, float tieBreakerMultiplier,
+ Scorer[] subScorers, int numScorers) throws IOException {
+ super(weight);
this.tieBreakerMultiplier = tieBreakerMultiplier;
// The passed subScorers array includes only scorers which have documents
// (DisjunctionMaxQuery takes care of that), and their nextDoc() was already
Modified: lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/DisjunctionSumScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/DisjunctionSumScorer.java?rev=1061650&r1=1061649&r2=1061650&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/DisjunctionSumScorer.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/DisjunctionSumScorer.java Fri Jan 21 06:42:40 2011
@@ -58,6 +58,7 @@ class DisjunctionSumScorer extends Score
private float currentScore = Float.NaN;
/** Construct a <code>DisjunctionScorer</code>.
+ * @param weight The weight to be used.
* @param subScorers A collection of at least two subscorers.
* @param minimumNrMatchers The positive minimum number of subscorers that should
* match to match this query.
@@ -67,8 +68,8 @@ class DisjunctionSumScorer extends Score
* <br>When minimumNrMatchers equals the number of subScorers,
* it more efficient to use <code>ConjunctionScorer</code>.
*/
- public DisjunctionSumScorer( List<Scorer> subScorers, int minimumNrMatchers) throws IOException {
- super(null);
+ public DisjunctionSumScorer(Weight weight, List<Scorer> subScorers, int minimumNrMatchers) throws IOException {
+ super(weight);
nrScorers = subScorers.size();
@@ -88,8 +89,8 @@ class DisjunctionSumScorer extends Score
/** Construct a <code>DisjunctionScorer</code>, using one as the minimum number
* of matching subscorers.
*/
- public DisjunctionSumScorer(List<Scorer> subScorers) throws IOException {
- this(subScorers, 1);
+ public DisjunctionSumScorer(Weight weight, List<Scorer> subScorers) throws IOException {
+ this(weight, subScorers, 1);
}
/** Called the first time nextDoc() or advance() is called to
Modified: lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/ExactPhraseScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/ExactPhraseScorer.java?rev=1061650&r1=1061649&r2=1061650&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/ExactPhraseScorer.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/ExactPhraseScorer.java Fri Jan 21 06:42:40 2011
@@ -60,9 +60,12 @@ final class ExactPhraseScorer extends Sc
private int docID = -1;
private int freq;
+ private final Similarity similarity;
+
ExactPhraseScorer(Weight weight, PhraseQuery.PostingsAndFreq[] postings,
Similarity similarity, byte[] norms) throws IOException {
- super(similarity, weight);
+ super(weight);
+ this.similarity = similarity;
this.norms = norms;
this.value = weight.getValue();
@@ -87,7 +90,7 @@ final class ExactPhraseScorer extends Sc
}
for (int i = 0; i < SCORE_CACHE_SIZE; i++) {
- scoreCache[i] = getSimilarity().tf((float) i) * value;
+ scoreCache[i] = similarity.tf((float) i) * value;
}
}
@@ -207,9 +210,9 @@ final class ExactPhraseScorer extends Sc
if (freq < SCORE_CACHE_SIZE) {
raw = scoreCache[freq];
} else {
- raw = getSimilarity().tf((float) freq) * value;
+ raw = similarity.tf((float) freq) * value;
}
- return norms == null ? raw : raw * getSimilarity().decodeNormValue(norms[docID]); // normalize
+ return norms == null ? raw : raw * similarity.decodeNormValue(norms[docID]); // normalize
}
private int phraseFreq() throws IOException {
Modified: lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/FilteredQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/FilteredQuery.java?rev=1061650&r1=1061649&r2=1061650&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/FilteredQuery.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/FilteredQuery.java Fri Jan 21 06:42:40 2011
@@ -62,7 +62,6 @@ extends Query {
@Override
public Weight createWeight(final IndexSearcher searcher) throws IOException {
final Weight weight = query.createWeight (searcher);
- final Similarity similarity = searcher.getSimilarity();
return new Weight() {
private float value;
@@ -127,7 +126,7 @@ extends Query {
return null;
}
- return new Scorer(similarity, this) {
+ return new Scorer(this) {
private int doc = -1;
Modified: lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/MatchAllDocsQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/MatchAllDocsQuery.java?rev=1061650&r1=1061649&r2=1061650&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/MatchAllDocsQuery.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/MatchAllDocsQuery.java Fri Jan 21 06:42:40 2011
@@ -51,10 +51,12 @@ public class MatchAllDocsQuery extends Q
private int doc = -1;
private final int maxDoc;
private final Bits delDocs;
+ private final Similarity similarity;
MatchAllScorer(IndexReader reader, Similarity similarity, Weight w,
byte[] norms) throws IOException {
- super(similarity,w);
+ super(w);
+ this.similarity = similarity;
delDocs = reader.getDeletedDocs();
score = w.getValue();
maxDoc = reader.maxDoc();
@@ -80,7 +82,7 @@ public class MatchAllDocsQuery extends Q
@Override
public float score() {
- return norms == null ? score : score * getSimilarity().decodeNormValue(norms[docID()]);
+ return norms == null ? score : score * similarity.decodeNormValue(norms[docID()]);
}
@Override
Modified: lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/MatchOnlyTermScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/MatchOnlyTermScorer.java?rev=1061650&r1=1061649&r2=1061650&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/MatchOnlyTermScorer.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/MatchOnlyTermScorer.java Fri Jan 21 06:42:40 2011
@@ -41,6 +41,7 @@ final class MatchOnlyTermScorer extends
private final Bits skipDocs;
private final int docFreq;
private int count;
+ private final Similarity similarity;
/**
* Construct a <code>TermScorer</code>.
@@ -56,8 +57,8 @@ final class MatchOnlyTermScorer extends
* The field norms of the document fields for the <code>Term</code>.
*/
MatchOnlyTermScorer(Weight weight, BulkPostingsEnum td, BlockReader docDeltasReader, int docFreq, Bits skipDocs, Similarity similarity, byte[] norms) throws IOException {
- super(similarity, weight);
-
+ super(weight);
+ this.similarity = similarity;
assert td.getFreqsReader() == null;
this.docsEnum = td;
@@ -68,7 +69,7 @@ final class MatchOnlyTermScorer extends
this.skipDocs = skipDocs;
this.norms = norms;
- rawScore = getSimilarity().tf(1f) * weight.getValue();
+ rawScore = similarity.tf(1f) * weight.getValue();
}
@Override
@@ -136,7 +137,7 @@ final class MatchOnlyTermScorer extends
assert !first;
assert doc != NO_MORE_DOCS;
- return norms == null ? rawScore : rawScore * getSimilarity().decodeNormValue(norms[doc]); // normalize for field
+ return norms == null ? rawScore : rawScore * similarity.decodeNormValue(norms[doc]); // normalize for field
}
/**
Modified: lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/PhraseScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/PhraseScorer.java?rev=1061650&r1=1061649&r2=1061650&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/PhraseScorer.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/PhraseScorer.java Fri Jan 21 06:42:40 2011
@@ -40,9 +40,12 @@ abstract class PhraseScorer extends Scor
private float freq; //phrase frequency in current doc as computed by phraseFreq().
+ protected final Similarity similarity;
+
PhraseScorer(Weight weight, PhraseQuery.PostingsAndFreq[] postings,
Similarity similarity, byte[] norms) {
- super(similarity, weight);
+ super(weight);
+ this.similarity = similarity;
this.norms = norms;
this.value = weight.getValue();
@@ -105,8 +108,8 @@ abstract class PhraseScorer extends Scor
@Override
public float score() throws IOException {
//System.out.println("scoring " + first.doc);
- float raw = getSimilarity().tf(freq) * value; // raw score
- return norms == null ? raw : raw * getSimilarity().decodeNormValue(norms[first.doc]); // normalize
+ float raw = similarity.tf(freq) * value; // raw score
+ return norms == null ? raw : raw * similarity.decodeNormValue(norms[first.doc]); // normalize
}
@Override
Modified: lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/ReqExclScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/ReqExclScorer.java?rev=1061650&r1=1061649&r2=1061650&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/ReqExclScorer.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/ReqExclScorer.java Fri Jan 21 06:42:40 2011
@@ -36,7 +36,7 @@ class ReqExclScorer extends Scorer {
* @param exclDisi indicates exclusion.
*/
public ReqExclScorer(Scorer reqScorer, DocIdSetIterator exclDisi) {
- super(null); // No similarity used.
+ super(reqScorer.weight);
this.reqScorer = reqScorer;
this.exclDisi = exclDisi;
}
Modified: lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/ReqOptSumScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/ReqOptSumScorer.java?rev=1061650&r1=1061649&r2=1061650&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/ReqOptSumScorer.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/ReqOptSumScorer.java Fri Jan 21 06:42:40 2011
@@ -38,7 +38,7 @@ class ReqOptSumScorer extends Scorer {
Scorer reqScorer,
Scorer optScorer)
{
- super(null); // No similarity used.
+ super(reqScorer.weight);
this.reqScorer = reqScorer;
this.optScorer = optScorer;
}
Modified: lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/ScoreCachingWrappingScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/ScoreCachingWrappingScorer.java?rev=1061650&r1=1061649&r2=1061650&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/ScoreCachingWrappingScorer.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/ScoreCachingWrappingScorer.java Fri Jan 21 06:42:40 2011
@@ -38,7 +38,7 @@ public class ScoreCachingWrappingScorer
/** Creates a new instance by wrapping the given scorer. */
public ScoreCachingWrappingScorer(Scorer scorer) {
- super(scorer.getSimilarity());
+ super(scorer.weight);
this.scorer = scorer;
}
@@ -46,11 +46,6 @@ public class ScoreCachingWrappingScorer
public boolean score(Collector collector, int max, int firstDocID) throws IOException {
return scorer.score(collector, max, firstDocID);
}
-
- @Override
- public Similarity getSimilarity() {
- return scorer.getSimilarity();
- }
@Override
public float score() throws IOException {
Modified: lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/Scorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/Scorer.java?rev=1061650&r1=1061649&r2=1061650&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/Scorer.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/Scorer.java Fri Jan 21 06:42:40 2011
@@ -40,31 +40,16 @@ import org.apache.lucene.search.BooleanC
* with these scores.
*/
public abstract class Scorer extends DocIdSetIterator {
- private final Similarity similarity;
protected final Weight weight;
- /** Constructs a Scorer.
- * @param similarity The <code>Similarity</code> implementation used by this scorer.
- */
- protected Scorer(Similarity similarity) {
- this(similarity, null);
- }
-
/**
* Constructs a Scorer
- * @param similarity The <code>Similarity</code> implementation used by this scorer.
- * @param weight The scorers <code>Weight</code>
+ * @param weight The scorers <code>Weight</code>.
*/
- protected Scorer(Similarity similarity, Weight weight) {
- this.similarity = similarity;
+ protected Scorer(Weight weight) {
this.weight = weight;
}
- /** Returns the Similarity implementation used by this scorer. */
- public Similarity getSimilarity() {
- return this.similarity;
- }
-
/** Scores and collects all matching documents.
* @param collector The collector to which all matching documents are passed.
*/
@@ -172,7 +157,7 @@ public abstract class Scorer extends Doc
* <p>
* Note: this method will throw {@link UnsupportedOperationException} if no
* associated {@link Weight} instance is provided to
- * {@link #Scorer(Similarity, Weight)}
+ * {@link #Scorer(Weight)}
* </p>
*
* @lucene.experimental
Modified: lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/SloppyPhraseScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/SloppyPhraseScorer.java?rev=1061650&r1=1061649&r2=1061650&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/SloppyPhraseScorer.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/SloppyPhraseScorer.java Fri Jan 21 06:42:40 2011
@@ -78,7 +78,7 @@ final class SloppyPhraseScorer extends P
int matchLength = end - start;
if (matchLength <= slop)
- freq += getSimilarity().sloppyFreq(matchLength); // score match
+ freq += similarity.sloppyFreq(matchLength); // score match
if (pp.position > end)
end = pp.position;
Modified: lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/TermScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/TermScorer.java?rev=1061650&r1=1061649&r2=1061650&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/TermScorer.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/TermScorer.java Fri Jan 21 06:42:40 2011
@@ -50,7 +50,8 @@ final class TermScorer extends Scorer {
private final Bits skipDocs;
private final int docFreq;
private int count;
-
+ private final Similarity similarity;
+
/**
* Construct a <code>TermScorer</code>.
*
@@ -65,7 +66,8 @@ final class TermScorer extends Scorer {
* The field norms of the document fields for the <code>Term</code>.
*/
TermScorer(Weight weight, BulkPostingsEnum td, BlockReader docDeltaReader, BlockReader freqReader, int docFreq, Bits skipDocs, Similarity similarity, byte[] norms) throws IOException {
- super(similarity, weight);
+ super(weight);
+ this.similarity = similarity;
this.docsEnum = td;
this.docFreq = docFreq;
this.docDeltasReader = docDeltaReader;
@@ -78,7 +80,7 @@ final class TermScorer extends Scorer {
this.weightValue = weight.getValue();
for (int i = 0; i < SCORE_CACHE_SIZE; i++)
- scoreCache[i] = getSimilarity().tf(i) * weightValue;
+ scoreCache[i] = similarity.tf(i) * weightValue;
}
@Override
@@ -150,9 +152,9 @@ final class TermScorer extends Scorer {
float raw = // compute tf(f)*weight
freq < SCORE_CACHE_SIZE // check cache
? scoreCache[freq] // cache hit
- : getSimilarity().tf(freq)*weightValue; // cache miss
+ : similarity.tf(freq)*weightValue; // cache miss
- return norms == null ? raw : raw * getSimilarity().decodeNormValue(norms[doc]); // normalize for field
+ return norms == null ? raw : raw * similarity.decodeNormValue(norms[doc]); // normalize for field
}
/**
Modified: lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/function/CustomScoreQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/function/CustomScoreQuery.java?rev=1061650&r1=1061649&r2=1061650&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/function/CustomScoreQuery.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/function/CustomScoreQuery.java Fri Jan 21 06:42:40 2011
@@ -30,7 +30,6 @@ import org.apache.lucene.search.Query;
import org.apache.lucene.search.Weight;
import org.apache.lucene.search.Scorer;
import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.Similarity;
import org.apache.lucene.util.ToStringUtils;
/**
@@ -183,13 +182,11 @@ public class CustomScoreQuery extends Qu
//=========================== W E I G H T ============================
private class CustomWeight extends Weight {
- Similarity similarity;
Weight subQueryWeight;
Weight[] valSrcWeights;
boolean qStrict;
public CustomWeight(IndexSearcher searcher) throws IOException {
- this.similarity = searcher.getSimilarity();
this.subQueryWeight = subQuery.weight(searcher);
this.valSrcWeights = new Weight[valSrcQueries.length];
for(int i = 0; i < valSrcQueries.length; i++) {
@@ -254,7 +251,7 @@ public class CustomScoreQuery extends Qu
for(int i = 0; i < valSrcScorers.length; i++) {
valSrcScorers[i] = valSrcWeights[i].scorer(context, scorerContext.scoreDocsInOrder(true));
}
- return new CustomScorer(similarity, context.reader, this, subQueryScorer, valSrcScorers);
+ return new CustomScorer(context.reader, this, subQueryScorer, valSrcScorers);
}
@Override
@@ -303,9 +300,9 @@ public class CustomScoreQuery extends Qu
private float vScores[]; // reused in score() to avoid allocating this array for each doc
// constructor
- private CustomScorer(Similarity similarity, IndexReader reader, CustomWeight w,
+ private CustomScorer(IndexReader reader, CustomWeight w,
Scorer subQueryScorer, Scorer[] valSrcScorers) throws IOException {
- super(similarity,w);
+ super(w);
this.qWeight = w.getValue();
this.subQueryScorer = subQueryScorer;
this.valSrcScorers = valSrcScorers;
Modified: lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/function/ValueSourceQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/function/ValueSourceQuery.java?rev=1061650&r1=1061649&r2=1061650&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/function/ValueSourceQuery.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/function/ValueSourceQuery.java Fri Jan 21 06:42:40 2011
@@ -64,12 +64,10 @@ public class ValueSourceQuery extends Qu
}
class ValueSourceWeight extends Weight {
- Similarity similarity;
float queryNorm;
float queryWeight;
public ValueSourceWeight(IndexSearcher searcher) {
- this.similarity = searcher.getSimilarity();
}
/*(non-Javadoc) @see org.apache.lucene.search.Weight#getQuery() */
@@ -100,7 +98,7 @@ public class ValueSourceQuery extends Qu
@Override
public Scorer scorer(AtomicReaderContext context, ScorerContext scorerContext) throws IOException {
- return new ValueSourceScorer(similarity, context, this);
+ return new ValueSourceScorer(context, this);
}
/*(non-Javadoc) @see org.apache.lucene.search.Weight#explain(org.apache.lucene.index.IndexReader, int) */
@@ -133,8 +131,8 @@ public class ValueSourceQuery extends Qu
private int doc = -1;
// constructor
- private ValueSourceScorer(Similarity similarity, AtomicReaderContext context, ValueSourceWeight w) throws IOException {
- super(similarity,w);
+ private ValueSourceScorer(AtomicReaderContext context, ValueSourceWeight w) throws IOException {
+ super(w);
final IndexReader reader = context.reader;
qWeight = w.getValue();
// this is when/where the values are first created.
Modified: lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/payloads/PayloadNearQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/payloads/PayloadNearQuery.java?rev=1061650&r1=1061649&r2=1061650&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/payloads/PayloadNearQuery.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/payloads/PayloadNearQuery.java Fri Jan 21 06:42:40 2011
@@ -153,7 +153,6 @@ public class PayloadNearQuery extends Sp
Spans spans;
protected float payloadScore;
private int payloadsSeen;
- Similarity similarity = getSimilarity();
protected PayloadNearSpanScorer(Spans spans, Weight weight,
Similarity similarity, byte[] norms) throws IOException {
@@ -211,7 +210,7 @@ public class PayloadNearQuery extends Sp
payloadsSeen = 0;
do {
int matchLength = spans.end() - spans.start();
- freq += getSimilarity().sloppyFreq(matchLength);
+ freq += similarity.sloppyFreq(matchLength);
Spans[] spansArr = new Spans[1];
spansArr[0] = spans;
getPayloads(spansArr);
Modified: lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/payloads/PayloadTermQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/payloads/PayloadTermQuery.java?rev=1061650&r1=1061649&r2=1061650&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/payloads/PayloadTermQuery.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/payloads/PayloadTermQuery.java Fri Jan 21 06:42:40 2011
@@ -100,12 +100,11 @@ public class PayloadTermQuery extends Sp
freq = 0.0f;
payloadScore = 0;
payloadsSeen = 0;
- Similarity similarity1 = getSimilarity();
while (more && doc == spans.doc()) {
int matchLength = spans.end() - spans.start();
- freq += similarity1.sloppyFreq(matchLength);
- processPayload(similarity1);
+ freq += similarity.sloppyFreq(matchLength);
+ processPayload(similarity);
more = spans.next();// this moves positions to the next match in this
// document
Modified: lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/spans/FieldMaskingSpanQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/spans/FieldMaskingSpanQuery.java?rev=1061650&r1=1061649&r2=1061650&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/spans/FieldMaskingSpanQuery.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/spans/FieldMaskingSpanQuery.java Fri Jan 21 06:42:40 2011
@@ -25,7 +25,6 @@ import org.apache.lucene.index.Term;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.Weight;
import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.Similarity;
import org.apache.lucene.util.ToStringUtils;
/**
Modified: lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/spans/SpanScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/spans/SpanScorer.java?rev=1061650&r1=1061649&r2=1061650&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/spans/SpanScorer.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/search/spans/SpanScorer.java Fri Jan 21 06:42:40 2011
@@ -36,10 +36,12 @@ public class SpanScorer extends Scorer {
protected int doc;
protected float freq;
-
+ protected final Similarity similarity;
+
protected SpanScorer(Spans spans, Weight weight, Similarity similarity, byte[] norms)
throws IOException {
- super(similarity, weight);
+ super(weight);
+ this.similarity = similarity;
this.spans = spans;
this.norms = norms;
this.value = weight.getValue();
@@ -81,7 +83,7 @@ public class SpanScorer extends Scorer {
freq = 0.0f;
do {
int matchLength = spans.end() - spans.start();
- freq += getSimilarity().sloppyFreq(matchLength);
+ freq += similarity.sloppyFreq(matchLength);
more = spans.next();
} while (more && (doc == spans.doc()));
return true;
@@ -92,8 +94,8 @@ public class SpanScorer extends Scorer {
@Override
public float score() throws IOException {
- float raw = getSimilarity().tf(freq) * value; // raw score
- return norms == null? raw : raw * getSimilarity().decodeNormValue(norms[doc]); // normalize
+ float raw = similarity.tf(freq) * value; // raw score
+ return norms == null? raw : raw * similarity.decodeNormValue(norms[doc]); // normalize
}
@Override
@@ -109,7 +111,7 @@ public class SpanScorer extends Scorer {
int expDoc = advance(doc);
float phraseFreq = (expDoc == doc) ? freq : 0.0f;
- tfExplanation.setValue(getSimilarity().tf(phraseFreq));
+ tfExplanation.setValue(similarity.tf(phraseFreq));
tfExplanation.setDescription("tf(phraseFreq=" + phraseFreq + ")");
return tfExplanation;
Modified: lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/store/BufferedIndexInput.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/store/BufferedIndexInput.java?rev=1061650&r1=1061649&r2=1061650&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/store/BufferedIndexInput.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/store/BufferedIndexInput.java Fri Jan 21 06:42:40 2011
@@ -144,6 +144,68 @@ public abstract class BufferedIndexInput
}
}
+ @Override
+ public short readShort() throws IOException {
+ if (2 <= (bufferLength-bufferPosition)) {
+ return (short) (((buffer[bufferPosition++] & 0xFF) << 8) | (buffer[bufferPosition++] & 0xFF));
+ } else {
+ return super.readShort();
+ }
+ }
+
+ @Override
+ public int readInt() throws IOException {
+ if (4 <= (bufferLength-bufferPosition)) {
+ return ((buffer[bufferPosition++] & 0xFF) << 24) | ((buffer[bufferPosition++] & 0xFF) << 16)
+ | ((buffer[bufferPosition++] & 0xFF) << 8) | (buffer[bufferPosition++] & 0xFF);
+ } else {
+ return super.readInt();
+ }
+ }
+
+ @Override
+ public long readLong() throws IOException {
+ if (8 <= (bufferLength-bufferPosition)) {
+ final int i1 = ((buffer[bufferPosition++] & 0xff) << 24) | ((buffer[bufferPosition++] & 0xff) << 16) |
+ ((buffer[bufferPosition++] & 0xff) << 8) | (buffer[bufferPosition++] & 0xff);
+ final int i2 = ((buffer[bufferPosition++] & 0xff) << 24) | ((buffer[bufferPosition++] & 0xff) << 16) |
+ ((buffer[bufferPosition++] & 0xff) << 8) | (buffer[bufferPosition++] & 0xff);
+ return (((long)i1) << 32) | (i2 & 0xFFFFFFFFL);
+ } else {
+ return super.readLong();
+ }
+ }
+
+ @Override
+ public int readVInt() throws IOException {
+ if (5 <= (bufferLength-bufferPosition)) {
+ byte b = buffer[bufferPosition++];
+ int i = b & 0x7F;
+ for (int shift = 7; (b & 0x80) != 0; shift += 7) {
+ b = buffer[bufferPosition++];
+ i |= (b & 0x7F) << shift;
+ }
+ return i;
+ } else {
+ return super.readVInt();
+ }
+ }
+
+ @Override
+ public long readVLong() throws IOException {
+ if (9 <= bufferLength-bufferPosition) {
+ byte b = buffer[bufferPosition++];
+ long i = b & 0x7F;
+ for (int shift = 7; (b & 0x80) != 0; shift += 7) {
+ b = buffer[bufferPosition++];
+ i |= (b & 0x7FL) << shift;
+ }
+ return i;
+ } else {
+ return super.readVLong();
+ }
+ }
+
private void refill() throws IOException {
long start = bufferStart + bufferPosition;
long end = start + bufferSize;
Modified: lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/search/JustCompileSearch.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/search/JustCompileSearch.java?rev=1061650&r1=1061649&r2=1061650&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/search/JustCompileSearch.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/search/JustCompileSearch.java Fri Jan 21 06:42:40 2011
@@ -210,8 +210,8 @@ final class JustCompileSearch {
static final class JustCompileScorer extends Scorer {
- protected JustCompileScorer(Similarity similarity) {
- super(similarity);
+ protected JustCompileScorer(Weight weight) {
+ super(weight);
}
@Override
Modified: lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/search/TestBooleanScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/search/TestBooleanScorer.java?rev=1061650&r1=1061649&r2=1061650&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/search/TestBooleanScorer.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/search/TestBooleanScorer.java Fri Jan 21 06:42:40 2011
@@ -75,9 +75,8 @@ public class TestBooleanScorer extends L
IndexReader ir = writer.getReader();
writer.close();
IndexSearcher searcher = new IndexSearcher(ir);
-
- Similarity sim = Similarity.getDefault();
- Scorer[] scorers = new Scorer[] {new Scorer(sim) {
+ BooleanWeight weight = (BooleanWeight) new BooleanQuery().createWeight(searcher);
+ Scorer[] scorers = new Scorer[] {new Scorer(weight) {
private int doc = -1;
@Override public float score() throws IOException { return 0; }
@Override public int docID() { return doc; }
@@ -91,7 +90,7 @@ public class TestBooleanScorer extends L
}
}};
- BooleanWeight weight = (BooleanWeight) new BooleanQuery().createWeight(searcher);
+
BooleanScorer bs = new BooleanScorer(weight, false, 1, Arrays.asList(scorers), null, scorers.length);
assertEquals("should have received 3000", 3000, bs.nextDoc());
Modified: lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/search/TestPositiveScoresOnlyCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/search/TestPositiveScoresOnlyCollector.java?rev=1061650&r1=1061649&r2=1061650&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/search/TestPositiveScoresOnlyCollector.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/search/TestPositiveScoresOnlyCollector.java Fri Jan 21 06:42:40 2011
@@ -19,6 +19,10 @@ package org.apache.lucene.search;
import java.io.IOException;
+import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.RandomIndexWriter;
+import org.apache.lucene.index.Term;
+import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
public class TestPositiveScoresOnlyCollector extends LuceneTestCase {
@@ -26,8 +30,8 @@ public class TestPositiveScoresOnlyColle
private static final class SimpleScorer extends Scorer {
private int idx = -1;
- public SimpleScorer() {
- super(null);
+ public SimpleScorer(Weight weight) {
+ super(weight);
}
@Override public float score() throws IOException {
@@ -65,7 +69,14 @@ public class TestPositiveScoresOnlyColle
}
}
- Scorer s = new SimpleScorer();
+ Directory directory = newDirectory();
+ RandomIndexWriter writer = new RandomIndexWriter(random, directory);
+ writer.commit();
+ IndexReader ir = writer.getReader();
+ writer.close();
+ IndexSearcher searcher = new IndexSearcher(ir);
+ Weight fake = new TermQuery(new Term("fake", "weight")).createWeight(searcher);
+ Scorer s = new SimpleScorer(fake);
TopDocsCollector<ScoreDoc> tdc = TopScoreDocCollector.create(scores.length, true);
Collector c = new PositiveScoresOnlyCollector(tdc);
c.setScorer(s);
@@ -78,6 +89,9 @@ public class TestPositiveScoresOnlyColle
for (int i = 0; i < sd.length; i++) {
assertTrue("only positive scores should return: " + sd[i].score, sd[i].score > 0);
}
+ searcher.close();
+ ir.close();
+ directory.close();
}
}
Modified: lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/search/TestScoreCachingWrappingScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/search/TestScoreCachingWrappingScorer.java?rev=1061650&r1=1061649&r2=1061650&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/search/TestScoreCachingWrappingScorer.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/search/TestScoreCachingWrappingScorer.java Fri Jan 21 06:42:40 2011
@@ -19,7 +19,11 @@ package org.apache.lucene.search;
import java.io.IOException;
+import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.IndexReader.AtomicReaderContext;
+import org.apache.lucene.index.Term;
+import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
public class TestScoreCachingWrappingScorer extends LuceneTestCase {
@@ -28,8 +32,8 @@ public class TestScoreCachingWrappingSco
private int idx = 0;
private int doc = -1;
- public SimpleScorer() {
- super(null);
+ public SimpleScorer(Weight weight) {
+ super(weight);
}
@Override public float score() throws IOException {
@@ -95,8 +99,14 @@ public class TestScoreCachingWrappingSco
8.108544f, 4.961808f, 2.2423935f, 7.285586f, 4.6699767f };
public void testGetScores() throws Exception {
-
- Scorer s = new SimpleScorer();
+ Directory directory = newDirectory();
+ RandomIndexWriter writer = new RandomIndexWriter(random, directory);
+ writer.commit();
+ IndexReader ir = writer.getReader();
+ writer.close();
+ IndexSearcher searcher = new IndexSearcher(ir);
+ Weight fake = new TermQuery(new Term("fake", "weight")).createWeight(searcher);
+ Scorer s = new SimpleScorer(fake);
ScoreCachingCollector scc = new ScoreCachingCollector(scores.length);
scc.setScorer(s);
@@ -109,7 +119,9 @@ public class TestScoreCachingWrappingSco
for (int i = 0; i < scores.length; i++) {
assertEquals(scores[i], scc.mscores[i], 0f);
}
-
+ searcher.close();
+ ir.close();
+ directory.close();
}
}
Modified: lucene/dev/branches/bulkpostings/modules/benchmark/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/modules/benchmark/build.xml?rev=1061650&r1=1061649&r2=1061650&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/modules/benchmark/build.xml (original)
+++ lucene/dev/branches/bulkpostings/modules/benchmark/build.xml Fri Jan 21 06:42:40 2011
@@ -260,5 +260,6 @@
</target>
<target name="init" depends="contrib-build.init,compile-demo,compile-memory,compile-highlighter,compile-analyzers-common"/>
-
+
+ <target name="dist-maven" depends="jar-core,javadocs,contrib-build.dist-maven"/>
</project>
Modified: lucene/dev/branches/bulkpostings/modules/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/modules/build.xml?rev=1061650&r1=1061649&r2=1061650&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/modules/build.xml (original)
+++ lucene/dev/branches/bulkpostings/modules/build.xml Fri Jan 21 06:42:40 2011
@@ -56,6 +56,8 @@
<target name="generate-maven-artifacts" description="Generate Maven Artifacts for Modules">
<sequential>
+ <ant target="get-maven-poms" inheritAll="false" dir=".."/>
+
<subant target="dist-maven" inheritall="false" failonerror="true">
<fileset dir="analysis" includes="build.xml" />
<fileset dir="benchmark" includes="build.xml" />
Modified: lucene/dev/branches/bulkpostings/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/CHANGES.txt?rev=1061650&r1=1061649&r2=1061650&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/CHANGES.txt (original)
+++ lucene/dev/branches/bulkpostings/solr/CHANGES.txt Fri Jan 21 06:42:40 2011
@@ -738,6 +738,10 @@ Build
* SOLR-2042: Fixed some Maven deps (Drew Farris via gsingers)
+* LUCENE-2657: Switch from using Maven POM templates to full POMs when
+ generating Maven artifacts (Steven Rowe)
+
+
Documentation
----------------------