You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2012/07/19 17:59:32 UTC
svn commit: r1363400 [18/31] - in /lucene/dev/branches/pforcodec_3892: ./
dev-tools/ dev-tools/eclipse/ dev-tools/idea/.idea/
dev-tools/idea/.idea/copyright/ dev-tools/idea/.idea/libraries/
dev-tools/idea/lucene/ dev-tools/maven/ dev-tools/maven/lucene...
Modified: lucene/dev/branches/pforcodec_3892/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java?rev=1363400&r1=1363399&r2=1363400&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java Thu Jul 19 15:58:54 2012
@@ -20,6 +20,7 @@ package org.apache.lucene.search.join;
import java.io.IOException;
import java.util.Collection;
import java.util.Collections;
+import java.util.Locale;
import java.util.Set;
import org.apache.lucene.index.AtomicReaderContext;
@@ -217,6 +218,7 @@ public class ToParentBlockJoinQuery exte
private int parentDoc = -1;
private int prevParentDoc;
private float parentScore;
+ private float parentFreq;
private int nextChildDoc;
private int[] pendingChildDocs = new int[5];
@@ -238,7 +240,7 @@ public class ToParentBlockJoinQuery exte
@Override
public Collection<ChildScorer> getChildren() {
- return Collections.singletonList(new ChildScorer(childScorer, "BLOCK_JOIN"));
+ return Collections.singleton(new ChildScorer(childScorer, "BLOCK_JOIN"));
}
int getChildCount() {
@@ -298,7 +300,9 @@ public class ToParentBlockJoinQuery exte
}
float totalScore = 0;
+ float totalFreq = 0;
float maxScore = Float.NEGATIVE_INFINITY;
+ float maxFreq = 0;
childDocUpto = 0;
do {
@@ -314,9 +318,12 @@ public class ToParentBlockJoinQuery exte
if (scoreMode != ScoreMode.None) {
// TODO: specialize this into dedicated classes per-scoreMode
final float childScore = childScorer.score();
+ final float childFreq = childScorer.freq();
pendingChildScores[childDocUpto] = childScore;
maxScore = Math.max(childScore, maxScore);
+ maxFreq = Math.max(childFreq, maxFreq);
totalScore += childScore;
+ totalFreq += childFreq;
}
childDocUpto++;
nextChildDoc = childScorer.nextDoc();
@@ -328,12 +335,15 @@ public class ToParentBlockJoinQuery exte
switch(scoreMode) {
case Avg:
parentScore = totalScore / childDocUpto;
+ parentFreq = totalFreq / childDocUpto;
break;
case Max:
parentScore = maxScore;
+ parentFreq = maxFreq;
break;
case Total:
parentScore = totalScore;
+ parentFreq = totalFreq;
break;
case None:
break;
@@ -353,6 +363,11 @@ public class ToParentBlockJoinQuery exte
public float score() throws IOException {
return parentScore;
}
+
+ @Override
+ public float freq() {
+ return parentFreq;
+ }
@Override
public int advance(int parentTarget) throws IOException {
@@ -395,7 +410,7 @@ public class ToParentBlockJoinQuery exte
int start = docBase + prevParentDoc + 1; // +1 b/c prevParentDoc is previous parent doc
int end = docBase + parentDoc - 1; // -1 b/c parentDoc is parent doc
return new ComplexExplanation(
- true, score(), String.format("Score based on child doc range from %d to %d", start, end)
+ true, score(), String.format(Locale.ROOT, "Score based on child doc range from %d to %d", start, end)
);
}
Modified: lucene/dev/branches/pforcodec_3892/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java?rev=1363400&r1=1363399&r2=1363400&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java Thu Jul 19 15:58:54 2012
@@ -32,6 +32,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
+import java.util.Locale;
public class TestBlockJoin extends LuceneTestCase {
@@ -638,7 +639,7 @@ public class TestBlockJoin extends Lucen
int childId = Integer.parseInt(document.get("childID"));
assertTrue(explanation.isMatch());
assertEquals(hit.score, explanation.getValue(), 0.0f);
- assertEquals(String.format("Score based on child doc range from %d to %d", hit.doc - 1 - childId, hit.doc - 1), explanation.getDescription());
+ assertEquals(String.format(Locale.ROOT, "Score based on child doc range from %d to %d", hit.doc - 1 - childId, hit.doc - 1), explanation.getDescription());
}
}
Modified: lucene/dev/branches/pforcodec_3892/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java?rev=1363400&r1=1363399&r2=1363400&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java Thu Jul 19 15:58:54 2012
@@ -47,11 +47,13 @@ import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.FixedBitSet;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util._TestUtil;
+import org.apache.lucene.util.LuceneTestCase.Slow;
import org.junit.Test;
import java.io.IOException;
import java.util.*;
+@Slow
public class TestJoinUtil extends LuceneTestCase {
public void testSimple() throws Exception {
@@ -230,7 +232,7 @@ public class TestJoinUtil extends Lucene
public void testSingleValueRandomJoin() throws Exception {
int maxIndexIter = _TestUtil.nextInt(random(), 6, 12);
int maxSearchIter = _TestUtil.nextInt(random(), 13, 26);
- executeRandomJoin(false, maxIndexIter, maxSearchIter);
+ executeRandomJoin(false, maxIndexIter, maxSearchIter, _TestUtil.nextInt(random(), 87, 764));
}
@Test
@@ -238,10 +240,10 @@ public class TestJoinUtil extends Lucene
public void testMultiValueRandomJoin() throws Exception {
int maxIndexIter = _TestUtil.nextInt(random(), 3, 6);
int maxSearchIter = _TestUtil.nextInt(random(), 6, 12);
- executeRandomJoin(true, maxIndexIter, maxSearchIter);
+ executeRandomJoin(true, maxIndexIter, maxSearchIter, _TestUtil.nextInt(random(), 11, 57));
}
- private void executeRandomJoin(boolean multipleValuesPerDocument, int maxIndexIter, int maxSearchIter) throws Exception {
+ private void executeRandomJoin(boolean multipleValuesPerDocument, int maxIndexIter, int maxSearchIter, int numberOfDocumentsToIndex) throws Exception {
for (int indexIter = 1; indexIter <= maxIndexIter; indexIter++) {
if (VERBOSE) {
System.out.println("indexIter=" + indexIter);
@@ -252,7 +254,6 @@ public class TestJoinUtil extends Lucene
dir,
newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random(), MockTokenizer.KEYWORD, false)).setMergePolicy(newLogMergePolicy())
);
- int numberOfDocumentsToIndex = _TestUtil.nextInt(random(), 87, 764);
IndexIterationContext context = createContext(numberOfDocumentsToIndex, w, multipleValuesPerDocument);
IndexReader topLevelReader = w.getReader();
@@ -299,7 +300,7 @@ public class TestJoinUtil extends Lucene
topScoreDocCollector.collect(doc);
}
- public void setNextReader(AtomicReaderContext context) throws IOException {
+ public void setNextReader(AtomicReaderContext context) {
docBase = context.docBase;
topScoreDocCollector.setNextReader(context);
}
@@ -317,12 +318,12 @@ public class TestJoinUtil extends Lucene
System.out.println("expected cardinality:" + expectedResult.cardinality());
DocIdSetIterator iterator = expectedResult.iterator();
for (int doc = iterator.nextDoc(); doc != DocIdSetIterator.NO_MORE_DOCS; doc = iterator.nextDoc()) {
- System.out.println(String.format("Expected doc[%d] with id value %s", doc, indexSearcher.doc(doc).get("id")));
+ System.out.println(String.format(Locale.ROOT, "Expected doc[%d] with id value %s", doc, indexSearcher.doc(doc).get("id")));
}
System.out.println("actual cardinality:" + actualResult.cardinality());
iterator = actualResult.iterator();
for (int doc = iterator.nextDoc(); doc != DocIdSetIterator.NO_MORE_DOCS; doc = iterator.nextDoc()) {
- System.out.println(String.format("Actual doc[%d] with id value %s", doc, indexSearcher.doc(doc).get("id")));
+ System.out.println(String.format(Locale.ROOT, "Actual doc[%d] with id value %s", doc, indexSearcher.doc(doc).get("id")));
}
}
assertEquals(expectedResult, actualResult);
@@ -496,7 +497,7 @@ public class TestJoinUtil extends Lucene
reuse = null;
}
- public void setScorer(Scorer scorer) throws IOException {
+ public void setScorer(Scorer scorer) {
this.scorer = scorer;
}
@@ -528,7 +529,7 @@ public class TestJoinUtil extends Lucene
terms = FieldCache.DEFAULT.getTerms(context.reader(), fromField);
}
- public void setScorer(Scorer scorer) throws IOException {
+ public void setScorer(Scorer scorer) {
this.scorer = scorer;
}
@@ -587,7 +588,7 @@ public class TestJoinUtil extends Lucene
}
public boolean acceptsDocsOutOfOrder() {return false;}
- public void setScorer(Scorer scorer) throws IOException {}
+ public void setScorer(Scorer scorer) {}
});
} else {
toSearcher.search(new MatchAllDocsQuery(), new Collector() {
@@ -596,7 +597,7 @@ public class TestJoinUtil extends Lucene
private int docBase;
private final BytesRef spare = new BytesRef();
- public void collect(int doc) throws IOException {
+ public void collect(int doc) {
JoinScore joinScore = joinValueToJoinScores.get(terms.getTerm(doc, spare));
if (joinScore == null) {
return;
@@ -610,7 +611,7 @@ public class TestJoinUtil extends Lucene
}
public boolean acceptsDocsOutOfOrder() {return false;}
- public void setScorer(Scorer scorer) throws IOException {}
+ public void setScorer(Scorer scorer) {}
});
}
queryVals.put(uniqueRandomValue, docToJoinScore);
@@ -625,7 +626,7 @@ public class TestJoinUtil extends Lucene
private TopDocs createExpectedTopDocs(String queryValue,
final boolean from,
final ScoreMode scoreMode,
- IndexIterationContext context) throws IOException {
+ IndexIterationContext context) {
Map<Integer, JoinScore> hitsToJoinScores;
if (from) {
Modified: lucene/dev/branches/pforcodec_3892/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java?rev=1363400&r1=1363399&r2=1363400&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java Thu Jul 19 15:58:54 2012
@@ -32,7 +32,6 @@ import org.apache.lucene.analysis.tokena
import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
import org.apache.lucene.analysis.tokenattributes.TermToBytesRefAttribute;
-import org.apache.lucene.document.Document;
import org.apache.lucene.index.AtomicReader;
import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.FieldInfo;
@@ -443,7 +442,7 @@ public class MemoryIndex {
}
@Override
- public void setScorer(Scorer scorer) throws IOException {
+ public void setScorer(Scorer scorer) {
this.scorer = scorer;
}
@@ -770,13 +769,13 @@ public class MemoryIndex {
}
@Override
- public long getSumDocFreq() throws IOException {
+ public long getSumDocFreq() {
// each term has df=1
return info.sortedTerms.length;
}
@Override
- public int getDocCount() throws IOException {
+ public int getDocCount() {
return info.sortedTerms.length > 0 ? 1 : 0;
}
@@ -1065,7 +1064,7 @@ public class MemoryIndex {
}
@Override
- public DocValues docValues(String field) throws IOException {
+ public DocValues docValues(String field) {
return null;
}
@@ -1075,7 +1074,7 @@ public class MemoryIndex {
private Similarity cachedSimilarity;
@Override
- public DocValues normValues(String field) throws IOException {
+ public DocValues normValues(String field) {
DocValues norms = cachedNormValues;
Similarity sim = getSimilarity();
if (!field.equals(cachedFieldName) || sim != cachedSimilarity) { // not cached?
Modified: lucene/dev/branches/pforcodec_3892/lucene/misc/src/java/org/apache/lucene/index/BalancedSegmentMergePolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/misc/src/java/org/apache/lucene/index/BalancedSegmentMergePolicy.java?rev=1363400&r1=1363399&r2=1363400&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/misc/src/java/org/apache/lucene/index/BalancedSegmentMergePolicy.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/misc/src/java/org/apache/lucene/index/BalancedSegmentMergePolicy.java Thu Jul 19 15:58:54 2012
@@ -245,7 +245,7 @@ public class BalancedSegmentMergePolicy
@Override
public MergeSpecification findForcedDeletesMerges(SegmentInfos infos)
- throws CorruptIndexException, IOException {
+ throws IOException {
final int numSegs = infos.size();
final int numLargeSegs = (numSegs < _numLargeSegments ? numSegs : _numLargeSegments);
MergeSpecification spec = null;
@@ -335,7 +335,7 @@ public class BalancedSegmentMergePolicy
}
}
- private OneMerge findOneSegmentToExpunge(SegmentInfos infos, int maxNumSegments) throws IOException {
+ private OneMerge findOneSegmentToExpunge(SegmentInfos infos, int maxNumSegments) {
int expungeCandidate = -1;
int maxDelCount = 0;
Modified: lucene/dev/branches/pforcodec_3892/lucene/misc/src/java/org/apache/lucene/index/IndexSplitter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/misc/src/java/org/apache/lucene/index/IndexSplitter.java?rev=1363400&r1=1363399&r2=1363400&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/misc/src/java/org/apache/lucene/index/IndexSplitter.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/misc/src/java/org/apache/lucene/index/IndexSplitter.java Thu Jul 19 15:58:54 2012
@@ -23,9 +23,11 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import java.util.Locale;
import org.apache.lucene.store.FSDirectory;
@@ -97,7 +99,7 @@ public class IndexSplitter {
}
public void listSegments() throws IOException {
- DecimalFormat formatter = new DecimalFormat("###,###.###");
+ DecimalFormat formatter = new DecimalFormat("###,###.###", DecimalFormatSymbols.getInstance(Locale.ROOT));
for (int x = 0; x < infos.size(); x++) {
SegmentInfoPerCommit info = infos.info(x);
String sizeStr = formatter.format(info.sizeInBytes());
Modified: lucene/dev/branches/pforcodec_3892/lucene/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java?rev=1363400&r1=1363399&r2=1363400&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java Thu Jul 19 15:58:54 2012
@@ -180,11 +180,11 @@ public class MultiPassIndexSplitter {
*/
private static final class FakeDeleteIndexReader extends BaseCompositeReader<FakeDeleteAtomicIndexReader> {
- public FakeDeleteIndexReader(IndexReader reader) throws IOException {
+ public FakeDeleteIndexReader(IndexReader reader) {
super(initSubReaders(reader));
}
- private static FakeDeleteAtomicIndexReader[] initSubReaders(IndexReader reader) throws IOException {
+ private static FakeDeleteAtomicIndexReader[] initSubReaders(IndexReader reader) {
final List<AtomicReaderContext> leaves = reader.getTopReaderContext().leaves();
final FakeDeleteAtomicIndexReader[] subs = new FakeDeleteAtomicIndexReader[leaves.size()];
int i = 0;
@@ -206,7 +206,7 @@ public class MultiPassIndexSplitter {
}
@Override
- protected void doClose() throws IOException {}
+ protected void doClose() {}
// no need to override numDocs/hasDeletions,
// as we pass the subreaders directly to IW.addIndexes().
Modified: lucene/dev/branches/pforcodec_3892/lucene/misc/src/java/org/apache/lucene/misc/HighFreqTerms.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/misc/src/java/org/apache/lucene/misc/HighFreqTerms.java?rev=1363400&r1=1363399&r2=1363400&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/misc/src/java/org/apache/lucene/misc/HighFreqTerms.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/misc/src/java/org/apache/lucene/misc/HighFreqTerms.java Thu Jul 19 15:58:54 2012
@@ -23,6 +23,7 @@ import org.apache.lucene.index.Directory
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.MultiFields;
import org.apache.lucene.index.Fields;
+import org.apache.lucene.index.ReaderUtil;
import org.apache.lucene.index.TermsEnum;
import org.apache.lucene.index.FieldsEnum;
import org.apache.lucene.index.Terms;
@@ -32,7 +33,6 @@ import org.apache.lucene.store.FSDirecto
import org.apache.lucene.util.PriorityQueue;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.Bits;
-import org.apache.lucene.util.ReaderUtil;
import java.io.File;
import java.io.IOException;
Modified: lucene/dev/branches/pforcodec_3892/lucene/misc/src/java/org/apache/lucene/store/NativeUnixDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/misc/src/java/org/apache/lucene/store/NativeUnixDirectory.java?rev=1363400&r1=1363399&r2=1363400&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/misc/src/java/org/apache/lucene/store/NativeUnixDirectory.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/misc/src/java/org/apache/lucene/store/NativeUnixDirectory.java Thu Jul 19 15:58:54 2012
@@ -199,7 +199,7 @@ public class NativeUnixDirectory extends
//}
@Override
- public void flush() throws IOException {
+ public void flush() {
// TODO -- I don't think this method is necessary?
}
@@ -257,7 +257,7 @@ public class NativeUnixDirectory extends
}
@Override
- public long length() throws IOException {
+ public long length() {
return fileLength + bufferPos;
}
Modified: lucene/dev/branches/pforcodec_3892/lucene/misc/src/test/org/apache/lucene/index/TestPKIndexSplitter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/misc/src/test/org/apache/lucene/index/TestPKIndexSplitter.java?rev=1363400&r1=1363399&r2=1363400&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/misc/src/test/org/apache/lucene/index/TestPKIndexSplitter.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/misc/src/test/org/apache/lucene/index/TestPKIndexSplitter.java Thu Jul 19 15:58:54 2012
@@ -18,7 +18,9 @@ package org.apache.lucene.index;
*/
import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
import java.text.NumberFormat;
+import java.util.Locale;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.analysis.MockTokenizer;
@@ -32,7 +34,7 @@ import org.apache.lucene.util.LuceneTest
public class TestPKIndexSplitter extends LuceneTestCase {
public void testSplit() throws Exception {
- NumberFormat format = new DecimalFormat("000000000");
+ NumberFormat format = new DecimalFormat("000000000", DecimalFormatSymbols.getInstance(Locale.ROOT));
Directory dir = newDirectory();
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(
TEST_VERSION_CURRENT, new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false))
Modified: lucene/dev/branches/pforcodec_3892/lucene/module-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/module-build.xml?rev=1363400&r1=1363399&r2=1363400&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/module-build.xml (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/module-build.xml Thu Jul 19 15:58:54 2012
@@ -312,9 +312,7 @@
<property name="analyzers-morfologik.jar" value="${common.dir}/build/analysis/morfologik/lucene-analyzers-morfologik-${version}.jar"/>
<fileset id="analyzers-morfologik.fileset" dir="${common.dir}">
<include name="build/analysis/morfologik/lucene-analyzers-morfologik-${version}.jar" />
- <include name="analysis/morfologik/lib/morfologik-fsa-1.5.2.jar" />
- <include name="analysis/morfologik/lib/morfologik-polish-1.5.2.jar" />
- <include name="analysis/morfologik/lib/morfologik-stemming-1.5.2.jar" />
+ <include name="analysis/morfologik/lib/morfologik-*.jar" />
</fileset>
<target name="check-analyzers-morfologik-uptodate" unless="analyzers-morfologik.uptodate">
<module-uptodate name="analysis/morfologik" jarfile="${analyzers-morfologik.jar}" property="analyzers-morfologik.uptodate"/>
Modified: lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/BoostingQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/BoostingQuery.java?rev=1363400&r1=1363399&r2=1363400&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/BoostingQuery.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/BoostingQuery.java Thu Jul 19 15:58:54 2012
@@ -38,9 +38,9 @@ import org.apache.lucene.search.*;
* and is documented here: http://wiki.apache.org/lucene-java/CommunityContributions
*/
public class BoostingQuery extends Query {
- private float boost; // the amount to boost by
- private Query match; // query to match
- private Query context; // boost when matches too
+ private final float boost; // the amount to boost by
+ private final Query match; // query to match
+ private final Query context; // boost when matches too
public BoostingQuery(Query match, Query context, float boost) {
this.match = match;
Modified: lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/ChainedFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/ChainedFilter.java?rev=1363400&r1=1363399&r2=1363400&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/ChainedFilter.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/ChainedFilter.java Thu Jul 19 15:58:54 2012
@@ -53,7 +53,7 @@ public class ChainedFilter extends Filte
/**
* Logical operation when none is declared. Defaults to OR.
*/
- public static int DEFAULT = OR;
+ public static final int DEFAULT = OR;
/**
* The filter chain
Modified: lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreProvider.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreProvider.java?rev=1363400&r1=1363399&r2=1363400&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreProvider.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreProvider.java Thu Jul 19 15:58:54 2012
@@ -78,8 +78,8 @@ public class CustomScoreProvider {
return customScore(doc, subQueryScore, 1);
}
float score = subQueryScore;
- for(int i = 0; i < valSrcScores.length; i++) {
- score *= valSrcScores[i];
+ for (float valSrcScore : valSrcScores) {
+ score *= valSrcScore;
}
return score;
}
@@ -127,13 +127,13 @@ public class CustomScoreProvider {
return subQueryExpl;
}
float valSrcScore = 1;
- for (int i = 0; i < valSrcExpls.length; i++) {
- valSrcScore *= valSrcExpls[i].getValue();
+ for (Explanation valSrcExpl : valSrcExpls) {
+ valSrcScore *= valSrcExpl.getValue();
}
Explanation exp = new Explanation( valSrcScore * subQueryExpl.getValue(), "custom score: product of:");
exp.addDetail(subQueryExpl);
- for (int i = 0; i < valSrcExpls.length; i++) {
- exp.addDetail(valSrcExpls[i]);
+ for (Explanation valSrcExpl : valSrcExpls) {
+ exp.addDetail(valSrcExpl);
}
return exp;
}
Modified: lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java?rev=1363400&r1=1363399&r2=1363400&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java Thu Jul 19 15:58:54 2012
@@ -18,6 +18,8 @@ package org.apache.lucene.queries;
*/
import java.io.IOException;
+import java.util.Collection;
+import java.util.Collections;
import java.util.Set;
import java.util.Arrays;
@@ -107,8 +109,8 @@ public class CustomScoreQuery extends Qu
@Override
public void extractTerms(Set<Term> terms) {
subQuery.extractTerms(terms);
- for(int i = 0; i < scoringQueries.length; i++) {
- scoringQueries[i].extractTerms(terms);
+ for (Query scoringQuery : scoringQueries) {
+ scoringQuery.extractTerms(terms);
}
}
@@ -129,8 +131,8 @@ public class CustomScoreQuery extends Qu
public String toString(String field) {
StringBuilder sb = new StringBuilder(name()).append("(");
sb.append(subQuery.toString(field));
- for(int i = 0; i < scoringQueries.length; i++) {
- sb.append(", ").append(scoringQueries[i].toString(field));
+ for (Query scoringQuery : scoringQueries) {
+ sb.append(", ").append(scoringQuery.toString(field));
}
sb.append(")");
sb.append(strict?" STRICT" : "");
@@ -199,11 +201,11 @@ public class CustomScoreQuery extends Qu
@Override
public float getValueForNormalization() throws IOException {
float sum = subQueryWeight.getValueForNormalization();
- for(int i = 0; i < valSrcWeights.length; i++) {
+ for (Weight valSrcWeight : valSrcWeights) {
if (qStrict) {
- valSrcWeights[i].getValueForNormalization(); // do not include ValueSource part in the query normalization
+ valSrcWeight.getValueForNormalization(); // do not include ValueSource part in the query normalization
} else {
- sum += valSrcWeights[i].getValueForNormalization();
+ sum += valSrcWeight.getValueForNormalization();
}
}
sum *= getBoost() * getBoost(); // boost each sub-weight
@@ -215,11 +217,11 @@ public class CustomScoreQuery extends Qu
public void normalize(float norm, float topLevelBoost) {
topLevelBoost *= getBoost(); // incorporate boost
subQueryWeight.normalize(norm, topLevelBoost);
- for(int i = 0; i < valSrcWeights.length; i++) {
+ for (Weight valSrcWeight : valSrcWeights) {
if (qStrict) {
- valSrcWeights[i].normalize(1, 1); // do not normalize the ValueSource part
+ valSrcWeight.normalize(1, 1); // do not normalize the ValueSource part
} else {
- valSrcWeights[i].normalize(norm, topLevelBoost);
+ valSrcWeight.normalize(norm, topLevelBoost);
}
}
}
@@ -283,14 +285,14 @@ public class CustomScoreQuery extends Qu
*/
private class CustomScorer extends Scorer {
private final float qWeight;
- private Scorer subQueryScorer;
- private Scorer[] valSrcScorers;
+ private final Scorer subQueryScorer;
+ private final Scorer[] valSrcScorers;
private final CustomScoreProvider provider;
- private float vScores[]; // reused in score() to avoid allocating this array for each doc
+ private final float[] vScores; // reused in score() to avoid allocating this array for each doc
// constructor
private CustomScorer(CustomScoreProvider provider, CustomWeight w, float qWeight,
- Scorer subQueryScorer, Scorer[] valSrcScorers) throws IOException {
+ Scorer subQueryScorer, Scorer[] valSrcScorers) {
super(w);
this.qWeight = qWeight;
this.subQueryScorer = subQueryScorer;
@@ -303,8 +305,8 @@ public class CustomScoreQuery extends Qu
public int nextDoc() throws IOException {
int doc = subQueryScorer.nextDoc();
if (doc != NO_MORE_DOCS) {
- for (int i = 0; i < valSrcScorers.length; i++) {
- valSrcScorers[i].advance(doc);
+ for (Scorer valSrcScorer : valSrcScorers) {
+ valSrcScorer.advance(doc);
}
}
return doc;
@@ -325,11 +327,21 @@ public class CustomScoreQuery extends Qu
}
@Override
+ public float freq() throws IOException {
+ return subQueryScorer.freq();
+ }
+
+ @Override
+ public Collection<ChildScorer> getChildren() {
+ return Collections.singleton(new ChildScorer(subQueryScorer, "CUSTOM"));
+ }
+
+ @Override
public int advance(int target) throws IOException {
int doc = subQueryScorer.advance(target);
if (doc != NO_MORE_DOCS) {
- for (int i = 0; i < valSrcScorers.length; i++) {
- valSrcScorers[i].advance(doc);
+ for (Scorer valSrcScorer : valSrcScorers) {
+ valSrcScorer.advance(doc);
}
}
return doc;
Modified: lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/TermsFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/TermsFilter.java?rev=1363400&r1=1363399&r2=1363400&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/TermsFilter.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/TermsFilter.java Thu Jul 19 15:58:54 2012
@@ -65,7 +65,7 @@ public class TermsFilter extends Filter
BytesRef br = new BytesRef();
String lastField = null;
- Terms termsC = null;
+ Terms termsC;
TermsEnum termsEnum = null;
DocsEnum docs = null;
for (Term term : terms) {
@@ -80,6 +80,7 @@ public class TermsFilter extends Filter
if (terms != null) { // TODO this check doesn't make sense, decide which variable its supposed to be for
br.copyBytes(term.bytes());
+ assert termsEnum != null;
if (termsEnum.seekCeil(br) == TermsEnum.SeekStatus.FOUND) {
docs = termsEnum.docs(acceptDocs, docs, false);
while (docs.nextDoc() != DocIdSetIterator.NO_MORE_DOCS) {
Modified: lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/BoostedQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/BoostedQuery.java?rev=1363400&r1=1363399&r2=1363400&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/BoostedQuery.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/BoostedQuery.java Thu Jul 19 15:58:54 2012
@@ -25,6 +25,8 @@ import org.apache.lucene.util.Bits;
import org.apache.lucene.util.ToStringUtils;
import java.io.IOException;
+import java.util.Collection;
+import java.util.Collections;
import java.util.Set;
import java.util.Map;
@@ -35,7 +37,7 @@ import java.util.Map;
// something has to give
public class BoostedQuery extends Query {
private Query q;
- private ValueSource boostVal; // optional, can be null
+ private final ValueSource boostVal; // optional, can be null
public BoostedQuery(Query subQuery, ValueSource boostVal) {
this.q = subQuery;
@@ -65,7 +67,7 @@ public class BoostedQuery extends Query
}
private class BoostedWeight extends Weight {
- IndexSearcher searcher;
+ final IndexSearcher searcher;
Weight qWeight;
Map fcontext;
@@ -164,6 +166,16 @@ public class BoostedQuery extends Query
return score>Float.NEGATIVE_INFINITY ? score : -Float.MAX_VALUE;
}
+ @Override
+ public float freq() throws IOException {
+ return scorer.freq();
+ }
+
+ @Override
+ public Collection<ChildScorer> getChildren() {
+ return Collections.singleton(new ChildScorer(scorer, "CUSTOM"));
+ }
+
public Explanation explain(int doc) throws IOException {
Explanation subQueryExpl = weight.qWeight.explain(readerContext ,doc);
if (!subQueryExpl.isMatch()) {
Modified: lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/FunctionQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/FunctionQuery.java?rev=1363400&r1=1363399&r2=1363400&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/FunctionQuery.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/FunctionQuery.java Thu Jul 19 15:58:54 2012
@@ -38,7 +38,7 @@ import java.util.Map;
*
*/
public class FunctionQuery extends Query {
- ValueSource func;
+ final ValueSource func;
/**
* @param func defines the function to be used for scoring
@@ -61,10 +61,10 @@ public class FunctionQuery extends Query
public void extractTerms(Set<Term> terms) {}
protected class FunctionWeight extends Weight {
- protected IndexSearcher searcher;
+ protected final IndexSearcher searcher;
protected float queryNorm;
protected float queryWeight;
- protected Map context;
+ protected final Map context;
public FunctionWeight(IndexSearcher searcher) throws IOException {
this.searcher = searcher;
@@ -158,6 +158,11 @@ public class FunctionQuery extends Query
return score>Float.NEGATIVE_INFINITY ? score : -Float.MAX_VALUE;
}
+ @Override
+ public float freq() throws IOException {
+ return 1;
+ }
+
public Explanation explain(int doc) throws IOException {
float sc = qWeight * vals.floatVal(doc);
Modified: lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/FunctionValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/FunctionValues.java?rev=1363400&r1=1363399&r2=1363400&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/FunctionValues.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/FunctionValues.java Thu Jul 19 15:58:54 2012
@@ -61,7 +61,7 @@ public abstract class FunctionValues {
}
target.copyChars(s);
return true;
- };
+ }
/** Native Java Object representation of the value */
public Object objectVal(int doc) {
Modified: lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/ValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/ValueSource.java?rev=1363400&r1=1363399&r2=1363400&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/ValueSource.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/ValueSource.java Thu Jul 19 15:58:54 2012
@@ -131,7 +131,7 @@ public abstract class ValueSource {
private final double[] values;
private FunctionValues docVals;
private double bottom;
- private Map fcontext;
+ private final Map fcontext;
ValueSourceComparator(Map fcontext, int numHits) {
this.fcontext = fcontext;
@@ -187,7 +187,7 @@ public abstract class ValueSource {
@Override
public int compareDocToValue(int doc, Double valueObj) {
- final double value = valueObj.doubleValue();
+ final double value = valueObj;
final double docValue = docVals.doubleVal(doc);
if (docValue < value) {
return -1;
Modified: lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/ValueSourceScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/ValueSourceScorer.java?rev=1363400&r1=1363399&r2=1363400&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/ValueSourceScorer.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/ValueSourceScorer.java Thu Jul 19 15:58:54 2012
@@ -25,7 +25,7 @@ import org.apache.lucene.util.Bits;
import java.io.IOException;
public class ValueSourceScorer extends Scorer {
- protected IndexReader reader;
+ protected final IndexReader reader;
private int doc = -1;
protected final int maxDoc;
protected final FunctionValues values;
@@ -82,4 +82,9 @@ public class ValueSourceScorer extends S
public float score() throws IOException {
return values.floatVal(doc);
}
+
+ @Override
+ public float freq() throws IOException {
+ return 1;
+ }
}
Modified: lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ByteFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ByteFieldSource.java?rev=1363400&r1=1363399&r2=1363400&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ByteFieldSource.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ByteFieldSource.java Thu Jul 19 15:58:54 2012
@@ -33,7 +33,7 @@ import org.apache.lucene.search.FieldCac
public class ByteFieldSource extends FieldCacheSource {
- private FieldCache.ByteParser parser;
+ private final FieldCache.ByteParser parser;
public ByteFieldSource(String field) {
this(field, null);
Modified: lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/DocFreqValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/DocFreqValueSource.java?rev=1363400&r1=1363399&r2=1363400&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/DocFreqValueSource.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/DocFreqValueSource.java Thu Jul 19 15:58:54 2012
@@ -124,10 +124,10 @@ class ConstDoubleDocValues extends Doubl
* @lucene.internal
*/
public class DocFreqValueSource extends ValueSource {
- protected String field;
- protected String indexedField;
- protected String val;
- protected BytesRef indexedBytes;
+ protected final String field;
+ protected final String indexedField;
+ protected final String val;
+ protected final BytesRef indexedBytes;
public DocFreqValueSource(String field, String val, String indexedField, BytesRef indexedBytes) {
this.field = field;
Modified: lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleFieldSource.java?rev=1363400&r1=1363399&r2=1363400&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleFieldSource.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleFieldSource.java Thu Jul 19 15:58:54 2012
@@ -40,7 +40,7 @@ import org.apache.lucene.util.mutable.Mu
public class DoubleFieldSource extends FieldCacheSource {
- protected FieldCache.DoubleParser parser;
+ protected final FieldCache.DoubleParser parser;
public DoubleFieldSource(String field) {
this(field, null);
Modified: lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/FieldCacheSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/FieldCacheSource.java?rev=1363400&r1=1363399&r2=1363400&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/FieldCacheSource.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/FieldCacheSource.java Thu Jul 19 15:58:54 2012
@@ -27,8 +27,8 @@ import org.apache.lucene.search.FieldCac
*
*/
public abstract class FieldCacheSource extends ValueSource {
- protected String field;
- protected FieldCache cache = FieldCache.DEFAULT;
+ protected final String field;
+ protected final FieldCache cache = FieldCache.DEFAULT;
public FieldCacheSource(String field) {
this.field=field;
@@ -58,6 +58,6 @@ public abstract class FieldCacheSource e
@Override
public int hashCode() {
return cache.hashCode() + field.hashCode();
- };
+ }
}
Modified: lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/FloatFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/FloatFieldSource.java?rev=1363400&r1=1363399&r2=1363400&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/FloatFieldSource.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/FloatFieldSource.java Thu Jul 19 15:58:54 2012
@@ -38,7 +38,7 @@ import org.apache.lucene.util.mutable.Mu
public class FloatFieldSource extends FieldCacheSource {
- protected FieldCache.FloatParser parser;
+ protected final FieldCache.FloatParser parser;
public FloatFieldSource(String field) {
this(field, null);
@@ -108,5 +108,5 @@ public class FloatFieldSource extends Fi
int h = parser==null ? Float.class.hashCode() : parser.getClass().hashCode();
h += super.hashCode();
return h;
- };
+ }
}
Modified: lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/IfFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/IfFunction.java?rev=1363400&r1=1363399&r2=1363400&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/IfFunction.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/IfFunction.java Thu Jul 19 15:58:54 2012
@@ -31,9 +31,9 @@ import java.util.Map;
public class IfFunction extends BoolFunction {
- private ValueSource ifSource;
- private ValueSource trueSource;
- private ValueSource falseSource;
+ private final ValueSource ifSource;
+ private final ValueSource trueSource;
+ private final ValueSource falseSource;
public IfFunction(ValueSource ifSource, ValueSource trueSource, ValueSource falseSource) {
Modified: lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/IntFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/IntFieldSource.java?rev=1363400&r1=1363399&r2=1363400&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/IntFieldSource.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/IntFieldSource.java Thu Jul 19 15:58:54 2012
@@ -172,5 +172,5 @@ public class IntFieldSource extends Fiel
int h = parser==null ? Integer.class.hashCode() : parser.getClass().hashCode();
h += super.hashCode();
return h;
- };
+ }
}
Modified: lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/JoinDocFreqValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/JoinDocFreqValueSource.java?rev=1363400&r1=1363399&r2=1363400&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/JoinDocFreqValueSource.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/JoinDocFreqValueSource.java Thu Jul 19 15:58:54 2012
@@ -22,11 +22,11 @@ import java.util.Map;
import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.ReaderUtil;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.docvalues.IntDocValues;
import org.apache.lucene.search.FieldCache.DocTerms;
import org.apache.lucene.util.BytesRef;
-import org.apache.lucene.util.ReaderUtil;
import org.apache.lucene.util.packed.PackedInts;
/**
@@ -57,16 +57,15 @@ public class JoinDocFreqValueSource exte
final IndexReader top = ReaderUtil.getTopLevelContext(readerContext).reader();
return new IntDocValues(this) {
- BytesRef ref = new BytesRef();
+ final BytesRef ref = new BytesRef();
@Override
public int intVal(int doc)
{
try {
terms.getTerm(doc, ref);
- int v = top.docFreq( qfield, ref );
//System.out.println( NAME+"["+field+"="+ref.utf8ToString()+"=("+qfield+":"+v+")]" );
- return v;
+ return top.docFreq( qfield, ref );
}
catch (IOException e) {
throw new RuntimeException("caught exception in function "+description()+" : doc="+doc, e);
@@ -86,5 +85,5 @@ public class JoinDocFreqValueSource exte
@Override
public int hashCode() {
return qfield.hashCode() + super.hashCode();
- };
+ }
}
Modified: lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/LiteralValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/LiteralValueSource.java?rev=1363400&r1=1363399&r2=1363400&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/LiteralValueSource.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/LiteralValueSource.java Thu Jul 19 15:58:54 2012
@@ -78,9 +78,8 @@ public class LiteralValueSource extends
LiteralValueSource that = (LiteralValueSource) o;
- if (!string.equals(that.string)) return false;
+ return string.equals(that.string);
- return true;
}
public static final int hash = LiteralValueSource.class.hashCode();
Modified: lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/LongFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/LongFieldSource.java?rev=1363400&r1=1363399&r2=1363400&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/LongFieldSource.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/LongFieldSource.java Thu Jul 19 15:58:54 2012
@@ -40,7 +40,7 @@ import org.apache.lucene.util.mutable.Mu
public class LongFieldSource extends FieldCacheSource {
- protected FieldCache.LongParser parser;
+ protected final FieldCache.LongParser parser;
public LongFieldSource(String field) {
this(field, null);
Modified: lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/NormValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/NormValueSource.java?rev=1363400&r1=1363399&r2=1363400&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/NormValueSource.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/NormValueSource.java Thu Jul 19 15:58:54 2012
@@ -29,7 +29,7 @@ import java.io.IOException;
import java.util.Map;
public class NormValueSource extends ValueSource {
- protected String field;
+ protected final String field;
public NormValueSource(String field) {
this.field = field;
}
Modified: lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/NumDocsValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/NumDocsValueSource.java?rev=1363400&r1=1363399&r2=1363400&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/NumDocsValueSource.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/NumDocsValueSource.java Thu Jul 19 15:58:54 2012
@@ -17,9 +17,9 @@
package org.apache.lucene.queries.function.valuesource;
import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.ReaderUtil;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
-import org.apache.lucene.util.ReaderUtil;
import java.io.IOException;
import java.util.Map;
Modified: lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/OrdFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/OrdFieldSource.java?rev=1363400&r1=1363399&r2=1363400&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/OrdFieldSource.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/OrdFieldSource.java Thu Jul 19 15:58:54 2012
@@ -21,12 +21,12 @@ import org.apache.lucene.index.AtomicRea
import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.CompositeReader;
import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.ReaderUtil;
import org.apache.lucene.index.SlowCompositeReaderWrapper;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.IntDocValues;
import org.apache.lucene.search.FieldCache;
-import org.apache.lucene.util.ReaderUtil;
import org.apache.lucene.util.mutable.MutableValue;
import org.apache.lucene.util.mutable.MutableValueInt;
@@ -52,7 +52,7 @@ import java.util.Map;
*/
public class OrdFieldSource extends ValueSource {
- protected String field;
+ protected final String field;
public OrdFieldSource(String field) {
this.field = field;
@@ -124,6 +124,6 @@ public class OrdFieldSource extends Valu
@Override
public int hashCode() {
return hcode + field.hashCode();
- };
+ }
}
Modified: lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/QueryValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/QueryValueSource.java?rev=1363400&r1=1363399&r2=1363400&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/QueryValueSource.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/QueryValueSource.java Thu Jul 19 15:58:54 2012
@@ -18,12 +18,12 @@
package org.apache.lucene.queries.function.valuesource;
import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.ReaderUtil;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.FloatDocValues;
import org.apache.lucene.search.*;
import org.apache.lucene.util.Bits;
-import org.apache.lucene.util.ReaderUtil;
import org.apache.lucene.util.mutable.MutableValue;
import org.apache.lucene.util.mutable.MutableValueFloat;
@@ -237,7 +237,6 @@ class QueryDocValues extends FloatDocVal
// a match!
mval.value = scorer.score();
mval.exists = true;
- return;
} catch (IOException e) {
throw new RuntimeException("caught exception in QueryDocVals("+q+") doc="+doc, e);
}
Modified: lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ReverseOrdFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ReverseOrdFieldSource.java?rev=1363400&r1=1363399&r2=1363400&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ReverseOrdFieldSource.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ReverseOrdFieldSource.java Thu Jul 19 15:58:54 2012
@@ -21,12 +21,12 @@ import org.apache.lucene.index.AtomicRea
import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.CompositeReader;
import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.ReaderUtil;
import org.apache.lucene.index.SlowCompositeReaderWrapper;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.IntDocValues;
import org.apache.lucene.search.FieldCache;
-import org.apache.lucene.util.ReaderUtil;
import java.io.IOException;
import java.util.Map;
@@ -53,7 +53,7 @@ import java.util.Map;
*/
public class ReverseOrdFieldSource extends ValueSource {
- public String field;
+ public final String field;
public ReverseOrdFieldSource(String field) {
this.field = field;
@@ -95,6 +95,6 @@ public class ReverseOrdFieldSource exten
@Override
public int hashCode() {
return hcode + field.hashCode();
- };
+ }
}
Modified: lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ScaleFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ScaleFloatFunction.java?rev=1363400&r1=1363399&r2=1363400&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ScaleFloatFunction.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ScaleFloatFunction.java Thu Jul 19 15:58:54 2012
@@ -18,11 +18,11 @@
package org.apache.lucene.queries.function.valuesource;
import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.ReaderUtil;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.docvalues.FloatDocValues;
import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.util.ReaderUtil;
import java.io.IOException;
import java.util.List;
Modified: lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SumTotalTermFreqValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SumTotalTermFreqValueSource.java?rev=1363400&r1=1363399&r2=1363400&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SumTotalTermFreqValueSource.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SumTotalTermFreqValueSource.java Thu Jul 19 15:58:54 2012
@@ -34,7 +34,7 @@ import java.util.Map;
* @lucene.internal
*/
public class SumTotalTermFreqValueSource extends ValueSource {
- protected String indexedField;
+ protected final String indexedField;
public SumTotalTermFreqValueSource(String indexedField) {
this.indexedField = indexedField;
Modified: lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TFValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TFValueSource.java?rev=1363400&r1=1363399&r2=1363400&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TFValueSource.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TFValueSource.java Thu Jul 19 15:58:54 2012
@@ -87,12 +87,12 @@ public class TFValueSource extends TermF
}
@Override
- public int nextDoc() throws IOException {
+ public int nextDoc() {
return DocIdSetIterator.NO_MORE_DOCS;
}
@Override
- public int advance(int target) throws IOException {
+ public int advance(int target) {
return DocIdSetIterator.NO_MORE_DOCS;
}
};
Modified: lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TermFreqValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TermFreqValueSource.java?rev=1363400&r1=1363399&r2=1363400&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TermFreqValueSource.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TermFreqValueSource.java Thu Jul 19 15:58:54 2012
@@ -80,12 +80,12 @@ public class TermFreqValueSource extends
}
@Override
- public int nextDoc() throws IOException {
+ public int nextDoc() {
return DocIdSetIterator.NO_MORE_DOCS;
}
@Override
- public int advance(int target) throws IOException {
+ public int advance(int target) {
return DocIdSetIterator.NO_MORE_DOCS;
}
};
Modified: lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TotalTermFreqValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TotalTermFreqValueSource.java?rev=1363400&r1=1363399&r2=1363400&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TotalTermFreqValueSource.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TotalTermFreqValueSource.java Thu Jul 19 15:58:54 2012
@@ -32,10 +32,10 @@ import java.util.Map;
* @lucene.internal
*/
public class TotalTermFreqValueSource extends ValueSource {
- protected String field;
- protected String indexedField;
- protected String val;
- protected BytesRef indexedBytes;
+ protected final String field;
+ protected final String indexedField;
+ protected final String val;
+ protected final BytesRef indexedBytes;
public TotalTermFreqValueSource(String field, String val, String indexedField, BytesRef indexedBytes) {
this.field = field;
Modified: lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/VectorValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/VectorValueSource.java?rev=1363400&r1=1363399&r2=1363400&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/VectorValueSource.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/VectorValueSource.java Thu Jul 19 15:58:54 2012
@@ -210,9 +210,8 @@ public class VectorValueSource extends M
VectorValueSource that = (VectorValueSource) o;
- if (!sources.equals(that.sources)) return false;
+ return sources.equals(that.sources);
- return true;
}
@Override
Modified: lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThis.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThis.java?rev=1363400&r1=1363399&r2=1363400&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThis.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThis.java Thu Jul 19 15:58:54 2012
@@ -717,8 +717,8 @@ public final class MoreLikeThis {
if (vector == null) {
Document d = ir.document(docNum);
IndexableField fields[] = d.getFields(fieldName);
- for (int j = 0; j < fields.length; j++) {
- final String stringValue = fields[j].stringValue();
+ for (IndexableField field : fields) {
+ final String stringValue = field.stringValue();
if (stringValue != null) {
addTermFrequencies(new StringReader(stringValue), termFreqMap, fieldName);
}
Modified: lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThisQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThisQuery.java?rev=1363400&r1=1363399&r2=1363400&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThisQuery.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThisQuery.java Thu Jul 19 15:58:54 2012
@@ -41,7 +41,7 @@ public class MoreLikeThisQuery extends Q
private String likeText;
private String[] moreLikeFields;
private Analyzer analyzer;
- private String fieldName;
+ private final String fieldName;
private float percentTermsToMatch = 0.3f;
private int minTermFrequency = 1;
private int maxQueryTerms = 5;
@@ -49,7 +49,7 @@ public class MoreLikeThisQuery extends Q
private int minDocFreq = -1;
/**
- * @param moreLikeFields
+ * @param moreLikeFields fields used for similarity measure
*/
public MoreLikeThisQuery(String likeText, String[] moreLikeFields, Analyzer analyzer, String fieldName) {
this.likeText = likeText;
Modified: lucene/dev/branches/pforcodec_3892/lucene/queries/src/test/org/apache/lucene/queries/ChainedFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/queries/src/test/org/apache/lucene/queries/ChainedFilterTest.java?rev=1363400&r1=1363399&r2=1363400&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/queries/src/test/org/apache/lucene/queries/ChainedFilterTest.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/queries/src/test/org/apache/lucene/queries/ChainedFilterTest.java Thu Jul 19 15:58:54 2012
@@ -19,6 +19,8 @@ package org.apache.lucene.queries;
import java.util.Calendar;
import java.util.GregorianCalendar;
+import java.util.Locale;
+import java.util.TimeZone;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
@@ -56,7 +58,8 @@ public class ChainedFilterTest extends L
super.setUp();
directory = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), directory);
- Calendar cal = new GregorianCalendar();
+ // we use the default Locale/TZ since LuceneTestCase randomizes it
+ Calendar cal = new GregorianCalendar(TimeZone.getDefault(), Locale.getDefault());
cal.clear();
cal.setTimeInMillis(1041397200000L); // 2003 January 01
@@ -183,7 +186,7 @@ public class ChainedFilterTest extends L
/*
private Date parseDate(String s) throws ParseException {
- return new SimpleDateFormat("yyyy MMM dd", Locale.US).parse(s);
+ return new SimpleDateFormat("yyyy MMM dd", Locale.ROOT).parse(s);
}
*/
Modified: lucene/dev/branches/pforcodec_3892/lucene/queries/src/test/org/apache/lucene/queries/TestCustomScoreQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/queries/src/test/org/apache/lucene/queries/TestCustomScoreQuery.java?rev=1363400&r1=1363399&r2=1363400&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/queries/src/test/org/apache/lucene/queries/TestCustomScoreQuery.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/queries/src/test/org/apache/lucene/queries/TestCustomScoreQuery.java Thu Jul 19 15:58:54 2012
@@ -20,8 +20,16 @@ package org.apache.lucene.queries;
import org.apache.lucene.queries.function.FunctionQuery;
import org.apache.lucene.queries.function.FunctionTestSetup;
import org.apache.lucene.queries.function.ValueSource;
-import org.apache.lucene.queries.function.valuesource.FloatFieldSource;
-import org.apache.lucene.search.*;
+import org.apache.lucene.search.BooleanClause;
+import org.apache.lucene.search.BooleanQuery;
+import org.apache.lucene.search.Explanation;
+import org.apache.lucene.search.FieldCache;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.QueryUtils;
+import org.apache.lucene.search.TermQuery;
+import org.apache.lucene.search.TermRangeQuery;
+import org.apache.lucene.search.TopDocs;
import org.junit.BeforeClass;
import org.junit.Test;
import java.io.IOException;
@@ -178,7 +186,7 @@ public class TestCustomScoreQuery extend
final int[] values = FieldCache.DEFAULT.getInts(context.reader(), INT_FIELD, false);
return new CustomScoreProvider(context) {
@Override
- public float customScore(int doc, float subScore, float valSrcScore) throws IOException {
+ public float customScore(int doc, float subScore, float valSrcScore) {
assertTrue(doc <= context.reader().maxDoc());
return values[doc];
}
Modified: lucene/dev/branches/pforcodec_3892/lucene/queries/src/test/org/apache/lucene/queries/function/TestOrdValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/queries/src/test/org/apache/lucene/queries/function/TestOrdValues.java?rev=1363400&r1=1363399&r2=1363400&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/queries/src/test/org/apache/lucene/queries/function/TestOrdValues.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/queries/src/test/org/apache/lucene/queries/function/TestOrdValues.java Thu Jul 19 15:58:54 2012
@@ -17,12 +17,15 @@ package org.apache.lucene.queries.functi
* limitations under the License.
*/
-import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.queries.function.valuesource.OrdFieldSource;
import org.apache.lucene.queries.function.valuesource.ReverseOrdFieldSource;
-import org.apache.lucene.search.*;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.QueryUtils;
+import org.apache.lucene.search.ScoreDoc;
+import org.apache.lucene.search.TopDocs;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -48,7 +51,7 @@ public class TestOrdValues extends Funct
* Test OrdFieldSource
*/
@Test
- public void testOrdFieldRank() throws CorruptIndexException, Exception {
+ public void testOrdFieldRank() throws Exception {
doTestRank(ID_FIELD, true);
}
@@ -56,12 +59,12 @@ public class TestOrdValues extends Funct
* Test ReverseOrdFieldSource
*/
@Test
- public void testReverseOrdFieldRank() throws CorruptIndexException, Exception {
+ public void testReverseOrdFieldRank() throws Exception {
doTestRank(ID_FIELD, false);
}
// Test that queries based on reverse/ordFieldScore scores correctly
- private void doTestRank(String field, boolean inOrder) throws CorruptIndexException, Exception {
+ private void doTestRank(String field, boolean inOrder) throws Exception {
IndexReader r = DirectoryReader.open(dir);
IndexSearcher s = new IndexSearcher(r);
ValueSource vs;
@@ -98,7 +101,7 @@ public class TestOrdValues extends Funct
* Test exact score for OrdFieldSource
*/
@Test
- public void testOrdFieldExactScore() throws CorruptIndexException, Exception {
+ public void testOrdFieldExactScore() throws Exception {
doTestExactScore(ID_FIELD, true);
}
@@ -106,13 +109,13 @@ public class TestOrdValues extends Funct
* Test exact score for ReverseOrdFieldSource
*/
@Test
- public void testReverseOrdFieldExactScore() throws CorruptIndexException, Exception {
+ public void testReverseOrdFieldExactScore() throws Exception {
doTestExactScore(ID_FIELD, false);
}
// Test that queries based on reverse/ordFieldScore returns docs with expected score.
- private void doTestExactScore(String field, boolean inOrder) throws CorruptIndexException, Exception {
+ private void doTestExactScore(String field, boolean inOrder) throws Exception {
IndexReader r = DirectoryReader.open(dir);
IndexSearcher s = new IndexSearcher(r);
ValueSource vs;
Modified: lucene/dev/branches/pforcodec_3892/lucene/queryparser/src/java/org/apache/lucene/queryparser/analyzing/AnalyzingQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/queryparser/src/java/org/apache/lucene/queryparser/analyzing/AnalyzingQueryParser.java?rev=1363400&r1=1363399&r2=1363400&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/queryparser/src/java/org/apache/lucene/queryparser/analyzing/AnalyzingQueryParser.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/queryparser/src/java/org/apache/lucene/queryparser/analyzing/AnalyzingQueryParser.java Thu Jul 19 15:58:54 2012
@@ -50,6 +50,7 @@ public class AnalyzingQueryParser extend
*/
public AnalyzingQueryParser(Version matchVersion, String field, Analyzer analyzer) {
super(matchVersion, field, analyzer);
+ setAnalyzeRangeTerms(true);
}
/**
@@ -278,72 +279,4 @@ public class AnalyzingQueryParser extend
return (nextToken == null) ? null : super.getFuzzyQuery(field, nextToken, minSimilarity);
}
-
- /**
- * Overrides super class, by passing terms through analyzer.
- * @exception ParseException
- */
- @Override
- protected Query getRangeQuery(String field, String part1, String part2, boolean startInclusive, boolean endInclusive)
- throws ParseException {
- // get Analyzer from superclass and tokenize the terms
- TokenStream source = null;
- CharTermAttribute termAtt = null;
- boolean multipleTokens = false;
-
- if (part1 != null) {
- // part1
- try {
- source = getAnalyzer().tokenStream(field, new StringReader(part1));
- termAtt = source.addAttribute(CharTermAttribute.class);
- source.reset();
- multipleTokens = false;
-
-
- if (source.incrementToken()) {
- part1 = termAtt.toString();
- }
- multipleTokens = source.incrementToken();
- } catch (IOException e) {
- // ignore
- }
- try {
- source.end();
- source.close();
- } catch (IOException e) {
- // ignore
- }
- if (multipleTokens) {
- throw new ParseException("Cannot build RangeQuery with analyzer " + getAnalyzer().getClass()
- + " - tokens were added to part1");
- }
- }
-
- if (part2 != null) {
- try {
- // part2
- source = getAnalyzer().tokenStream(field, new StringReader(part2));
- termAtt = source.addAttribute(CharTermAttribute.class);
- source.reset();
- if (source.incrementToken()) {
- part2 = termAtt.toString();
- }
- multipleTokens = source.incrementToken();
- } catch (IOException e) {
- // ignore
- }
- try {
- source.end();
- source.close();
- } catch (IOException e) {
- // ignore
- }
- if (multipleTokens) {
- throw new ParseException("Cannot build RangeQuery with analyzer " + getAnalyzer().getClass()
- + " - tokens were added to part2");
- }
- }
- return super.getRangeQuery(field, part1, part2, startInclusive, endInclusive);
- }
-
}
Modified: lucene/dev/branches/pforcodec_3892/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/FastCharStream.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/FastCharStream.java?rev=1363400&r1=1363399&r2=1363400&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/FastCharStream.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/FastCharStream.java Thu Jul 19 15:58:54 2012
@@ -99,7 +99,6 @@ public final class FastCharStream implem
try {
input.close();
} catch (IOException e) {
- System.err.println("Caught: " + e + "; ignoring.");
}
}
Modified: lucene/dev/branches/pforcodec_3892/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParserBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParserBase.java?rev=1363400&r1=1363399&r2=1363400&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParserBase.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParserBase.java Thu Jul 19 15:58:54 2012
@@ -71,6 +71,7 @@ public abstract class QueryParserBase {
float fuzzyMinSim = FuzzyQuery.defaultMinSimilarity;
int fuzzyPrefixLength = FuzzyQuery.defaultPrefixLength;
Locale locale = Locale.getDefault();
+ TimeZone timeZone = TimeZone.getDefault();
// the default date resolution
DateTools.Resolution dateResolution = null;
@@ -316,7 +317,8 @@ public abstract class QueryParserBase {
}
/**
- * Set locale used by date range parsing.
+ * Set locale used by date range parsing, lowercasing, and other
+ * locale-sensitive operations.
*/
public void setLocale(Locale locale) {
this.locale = locale;
@@ -328,6 +330,14 @@ public abstract class QueryParserBase {
public Locale getLocale() {
return locale;
}
+
+ public void setTimeZone(TimeZone timeZone) {
+ this.timeZone = timeZone;
+ }
+
+ public TimeZone getTimeZone() {
+ return timeZone;
+ }
/**
* Sets the default date resolution used by RangeQueries for fields for which no
@@ -478,11 +488,7 @@ public abstract class QueryParserBase {
PositionIncrementAttribute posIncrAtt = null;
int numTokens = 0;
- try {
- buffer.reset();
- } catch (IOException e) {
- throw new ParseException("Unable to initialize TokenStream to analyze query text", e);
- }
+ buffer.reset();
if (buffer.hasAttribute(TermToBytesRefAttribute.class)) {
termAtt = buffer.getAttribute(TermToBytesRefAttribute.class);
@@ -662,8 +668,8 @@ public abstract class QueryParserBase {
boolean endInclusive) throws ParseException
{
if (lowercaseExpandedTerms) {
- part1 = part1==null ? null : part1.toLowerCase();
- part2 = part2==null ? null : part2.toLowerCase();
+ part1 = part1==null ? null : part1.toLowerCase(locale);
+ part2 = part2==null ? null : part2.toLowerCase(locale);
}
@@ -681,7 +687,7 @@ public abstract class QueryParserBase {
// The user can only specify the date, not the time, so make sure
// the time is set to the latest possible time of that date to really
// include all documents:
- Calendar cal = Calendar.getInstance(locale);
+ Calendar cal = Calendar.getInstance(timeZone, locale);
cal.setTime(d2);
cal.set(Calendar.HOUR_OF_DAY, 23);
cal.set(Calendar.MINUTE, 59);
@@ -939,7 +945,7 @@ public abstract class QueryParserBase {
if (!allowLeadingWildcard && (termStr.startsWith("*") || termStr.startsWith("?")))
throw new ParseException("'*' or '?' not allowed as first character in WildcardQuery");
if (lowercaseExpandedTerms) {
- termStr = termStr.toLowerCase();
+ termStr = termStr.toLowerCase(locale);
}
Term t = new Term(field, termStr);
return newWildcardQuery(t);
@@ -968,7 +974,7 @@ public abstract class QueryParserBase {
protected Query getRegexpQuery(String field, String termStr) throws ParseException
{
if (lowercaseExpandedTerms) {
- termStr = termStr.toLowerCase();
+ termStr = termStr.toLowerCase(locale);
}
Term t = new Term(field, termStr);
return newRegexpQuery(t);
@@ -1002,7 +1008,7 @@ public abstract class QueryParserBase {
if (!allowLeadingWildcard && termStr.startsWith("*"))
throw new ParseException("'*' not allowed as first character in PrefixQuery");
if (lowercaseExpandedTerms) {
- termStr = termStr.toLowerCase();
+ termStr = termStr.toLowerCase(locale);
}
Term t = new Term(field, termStr);
return newPrefixQuery(t);
@@ -1022,7 +1028,7 @@ public abstract class QueryParserBase {
protected Query getFuzzyQuery(String field, String termStr, float minSimilarity) throws ParseException
{
if (lowercaseExpandedTerms) {
- termStr = termStr.toLowerCase();
+ termStr = termStr.toLowerCase(locale);
}
Term t = new Term(field, termStr);
return newFuzzyQuery(t, minSimilarity, fuzzyPrefixLength);
@@ -1072,7 +1078,7 @@ public abstract class QueryParserBase {
}
// extracted from the .jj grammar
- Query handleBoost(Query q, Token boost) throws ParseException {
+ Query handleBoost(Query q, Token boost) {
if (boost != null) {
float f = (float) 1.0;
try {
Modified: lucene/dev/branches/pforcodec_3892/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/BoostQueryNode.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/BoostQueryNode.java?rev=1363400&r1=1363399&r2=1363400&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/BoostQueryNode.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/BoostQueryNode.java Thu Jul 19 15:58:54 2012
@@ -21,7 +21,6 @@ import java.util.List;
import org.apache.lucene.queryparser.flexible.messages.MessageImpl;
import org.apache.lucene.queryparser.flexible.core.QueryNodeError;
-import org.apache.lucene.queryparser.flexible.core.QueryNodeException;
import org.apache.lucene.queryparser.flexible.core.messages.QueryParserMessages;
import org.apache.lucene.queryparser.flexible.core.parser.EscapeQuerySyntax;
@@ -43,10 +42,8 @@ public class BoostQueryNode extends Quer
* the query to be boosted
* @param value
* the boost value, it may vary from 0.0 to 1.0
- *
- * @throws QueryNodeException
*/
- public BoostQueryNode(QueryNode query, float value) throws QueryNodeException {
+ public BoostQueryNode(QueryNode query, float value) {
if (query == null) {
throw new QueryNodeError(new MessageImpl(
QueryParserMessages.NODE_ACTION_NOT_SUPPORTED, "query", "null"));
Modified: lucene/dev/branches/pforcodec_3892/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/PhraseSlopQueryNode.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/pforcodec_3892/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/PhraseSlopQueryNode.java?rev=1363400&r1=1363399&r2=1363400&view=diff
==============================================================================
--- lucene/dev/branches/pforcodec_3892/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/PhraseSlopQueryNode.java (original)
+++ lucene/dev/branches/pforcodec_3892/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/PhraseSlopQueryNode.java Thu Jul 19 15:58:54 2012
@@ -19,23 +19,17 @@ package org.apache.lucene.queryparser.fl
import org.apache.lucene.queryparser.flexible.messages.MessageImpl;
import org.apache.lucene.queryparser.flexible.core.QueryNodeError;
-import org.apache.lucene.queryparser.flexible.core.QueryNodeException;
import org.apache.lucene.queryparser.flexible.core.messages.QueryParserMessages;
import org.apache.lucene.queryparser.flexible.core.parser.EscapeQuerySyntax;
-import org.apache.lucene.queryparser.flexible.core.QueryNodeParseException;
public class PhraseSlopQueryNode extends QueryNodeImpl implements FieldableNode {
private int value = 0;
/**
- * @throws QueryNodeException
- * @throws QueryNodeParseException
- * @exception QueryNodeParseException
- * throw in overridden method to disallow
+ * @exception QueryNodeError throw in overridden method to disallow
*/
- public PhraseSlopQueryNode(QueryNode query, int value)
- throws QueryNodeException {
+ public PhraseSlopQueryNode(QueryNode query, int value) {
if (query == null) {
throw new QueryNodeError(new MessageImpl(
QueryParserMessages.NODE_ACTION_NOT_SUPPORTED, "query", "null"));