Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix some eclipse warnings (thanks Shai!) 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@942421 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael McCandless 2010-05-08 17:27:41 +00:00
parent 06f7a37943
commit 79839b1264
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lucene/src/java/org/apache/lucene/index/codecs/standard/StandardTermsDictReader.java
View File

@ -85,11 +85,13 @@ public class StandardTermsDictReader extends FieldsProducer {
term = new BytesRef(other.term); term = new BytesRef(other.term);
} }
@Override
public boolean equals(Object _other) { public boolean equals(Object _other) {
FieldAndTerm other = (FieldAndTerm) _other; FieldAndTerm other = (FieldAndTerm) _other;
return other.field == field && term.bytesEquals(other.term); return other.field == field && term.bytesEquals(other.term);
} }
@Override
public int hashCode() { public int hashCode() {
return field.hashCode() * 31 + term.hashCode(); return field.hashCode() * 31 + term.hashCode();
} }
@ -226,14 +228,14 @@ public class StandardTermsDictReader extends FieldsProducer {
final long numTerms; final long numTerms;
final FieldInfo fieldInfo; final FieldInfo fieldInfo;
final long termsStartPointer; final long termsStartPointer;
final StandardTermsIndexReader.FieldReader indexReader; final StandardTermsIndexReader.FieldReader fieldIndexReader;
FieldReader(StandardTermsIndexReader.FieldReader fieldIndexReader, FieldInfo fieldInfo, long numTerms, long termsStartPointer) { FieldReader(StandardTermsIndexReader.FieldReader fieldIndexReader, FieldInfo fieldInfo, long numTerms, long termsStartPointer) {
assert numTerms > 0; assert numTerms > 0;
this.fieldInfo = fieldInfo; this.fieldInfo = fieldInfo;
this.numTerms = numTerms; this.numTerms = numTerms;
this.termsStartPointer = termsStartPointer; this.termsStartPointer = termsStartPointer;
this.indexReader = fieldIndexReader; this.fieldIndexReader = fieldIndexReader;
} }
@Override @Override
@ -241,6 +243,7 @@ public class StandardTermsDictReader extends FieldsProducer {
return termComp; return termComp;
} }
@Override
public void close() { public void close() {
super.close(); super.close();
} }
@ -312,7 +315,7 @@ public class StandardTermsDictReader extends FieldsProducer {
} }
if (cmp < 0 && if (cmp < 0 &&
indexReader.nextIndexTerm(state.ord, indexResult) && fieldIndexReader.nextIndexTerm(state.ord, indexResult) &&
termComp.compare(indexResult.term, term) > 0) { termComp.compare(indexResult.term, term) > 0) {
// Optimization: requested term is within the // Optimization: requested term is within the
// same index block we are now in; skip seeking // same index block we are now in; skip seeking
@ -328,7 +331,7 @@ public class StandardTermsDictReader extends FieldsProducer {
// As index to find biggest index term that's <= // As index to find biggest index term that's <=
// our text: // our text:
indexReader.getIndexOffset(term, indexResult); fieldIndexReader.getIndexOffset(term, indexResult);
in.seek(indexResult.offset); in.seek(indexResult.offset);
seekPending = false; seekPending = false;
@ -373,7 +376,7 @@ public class StandardTermsDictReader extends FieldsProducer {
// term we are looking for. So, we should never // term we are looking for. So, we should never
// cross another index term (besides the first // cross another index term (besides the first
// one) while we are scanning: // one) while we are scanning:
assert state.ord == startOrd || !indexReader.isIndexTerm(state.ord, state.docFreq, true); assert state.ord == startOrd || !fieldIndexReader.isIndexTerm(state.ord, state.docFreq, true);
} }
return SeekStatus.END; return SeekStatus.END;
@ -389,7 +392,7 @@ public class StandardTermsDictReader extends FieldsProducer {
return SeekStatus.END; return SeekStatus.END;
} }
indexReader.getIndexOffset(ord, indexResult); fieldIndexReader.getIndexOffset(ord, indexResult);
in.seek(indexResult.offset); in.seek(indexResult.offset);
seekPending = false; seekPending = false;
@ -447,7 +450,7 @@ public class StandardTermsDictReader extends FieldsProducer {
// lookahead work when writing the index // lookahead work when writing the index
postingsReader.readTerm(in, postingsReader.readTerm(in,
fieldInfo, state, fieldInfo, state,
indexReader.isIndexTerm(1+state.ord, state.docFreq, false)); fieldIndexReader.isIndexTerm(1+state.ord, state.docFreq, false));
state.ord++; state.ord++;