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

rename set -> copyFrom in IntIndexInput.Index 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/pforcodec_3892@1357220 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael McCandless 2012-07-04 10:38:36 +00:00
parent 48d2049634
commit 4985b07040
6 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lucene/core/src/java/org/apache/lucene/codecs/intblock/FixedIntBlockIndexInput.java
View File

@ -151,7 +151,7 @@ public abstract class FixedIntBlockIndexInput extends IntIndexInput {
}
@Override
public void set(final IntIndexInput.Index other) {
public void copyFrom(final IntIndexInput.Index other) {
final Index idx = (Index) other;
fp = idx.fp;
upto = idx.upto;

2
lucene/core/src/java/org/apache/lucene/codecs/intblock/VariableIntBlockIndexInput.java
View File

@ -183,7 +183,7 @@ public abstract class VariableIntBlockIndexInput extends IntIndexInput {
}
@Override
public void set(final IntIndexInput.Index other) {
public void copyFrom(final IntIndexInput.Index other) {
final Index idx = (Index) other;
fp = idx.fp;
upto = idx.upto;

2
lucene/core/src/java/org/apache/lucene/codecs/sep/IntIndexInput.java
View File

@ -44,7 +44,7 @@ public abstract class IntIndexInput implements Closeable {
/** Seeks primary stream to the last read offset */
public abstract void seek(IntIndexInput.Reader stream) throws IOException;
public abstract void set(Index other);
public abstract void copyFrom(Index other);
@Override
public abstract Index clone();

18
lucene/core/src/java/org/apache/lucene/codecs/sep/SepPostingsReader.java
View File

@ -160,13 +160,13 @@ public class SepPostingsReader extends PostingsReaderBase {
if (docIndex == null) {
docIndex = other.docIndex.clone();
} else {
docIndex.set(other.docIndex);
docIndex.copyFrom(other.docIndex);
}
if (other.freqIndex != null) {
if (freqIndex == null) {
freqIndex = other.freqIndex.clone();
} else {
freqIndex.set(other.freqIndex);
freqIndex.copyFrom(other.freqIndex);
}
} else {
freqIndex = null;
@ -175,7 +175,7 @@ public class SepPostingsReader extends PostingsReaderBase {
if (posIndex == null) {
posIndex = other.posIndex.clone();
} else {
posIndex.set(other.posIndex);
posIndex.copyFrom(other.posIndex);
}
} else {
posIndex = null;
@ -356,11 +356,11 @@ public class SepPostingsReader extends PostingsReaderBase {
// TODO: can't we only do this if consumer
// skipped consuming the previous docs?
docIndex.set(termState.docIndex);
docIndex.copyFrom(termState.docIndex);
docIndex.seek(docReader);
if (!omitTF) {
freqIndex.set(termState.freqIndex);
freqIndex.copyFrom(termState.freqIndex);
freqIndex.seek(freqReader);
}
@ -520,15 +520,15 @@ public class SepPostingsReader extends PostingsReaderBase {
// TODO: can't we only do this if consumer
// skipped consuming the previous docs?
docIndex.set(termState.docIndex);
docIndex.copyFrom(termState.docIndex);
docIndex.seek(docReader);
//System.out.println(" docIndex=" + docIndex);
freqIndex.set(termState.freqIndex);
freqIndex.copyFrom(termState.freqIndex);
freqIndex.seek(freqReader);
//System.out.println(" freqIndex=" + freqIndex);
posIndex.set(termState.posIndex);
posIndex.copyFrom(termState.posIndex);
//System.out.println(" posIndex=" + posIndex);
posSeekPending = true;
payloadPending = false;
@ -633,7 +633,7 @@ public class SepPostingsReader extends PostingsReaderBase {
// NOTE: don't seek pos here; do it lazily
// instead. Eg a PhraseQuery may skip to many
// docs before finally asking for positions...
posIndex.set(skipper.getPosIndex());
posIndex.copyFrom(skipper.getPosIndex());
posSeekPending = true;
count = newCount;
doc = accum = skipper.getDoc();

18
lucene/core/src/java/org/apache/lucene/codecs/sep/SepSkipListReader.java
View File

@ -108,12 +108,12 @@ class SepSkipListReader extends MultiLevelSkipListReader {
lastPayloadPointer = payloadBasePointer;
for(int i=0;i<maxNumberOfSkipLevels;i++) {
docIndex[i].set(docBaseIndex);
docIndex[i].copyFrom(docBaseIndex);
if (freqIndex != null) {
freqIndex[i].set(freqBaseIndex);
freqIndex[i].copyFrom(freqBaseIndex);
}
if (posBaseIndex != null) {
posIndex[i].set(posBaseIndex);
posIndex[i].copyFrom(posBaseIndex);
}
}
Arrays.fill(payloadPointer, payloadBasePointer);
@ -145,20 +145,20 @@ class SepSkipListReader extends MultiLevelSkipListReader {
lastPayloadPointer = payloadPointer[level];
lastPayloadLength = payloadLength[level];
if (freqIndex != null) {
lastFreqIndex.set(freqIndex[level]);
lastFreqIndex.copyFrom(freqIndex[level]);
}
lastDocIndex.set(docIndex[level]);
lastDocIndex.copyFrom(docIndex[level]);
if (lastPosIndex != null) {
lastPosIndex.set(posIndex[level]);
lastPosIndex.copyFrom(posIndex[level]);
}
if (level > 0) {
if (freqIndex != null) {
freqIndex[level-1].set(freqIndex[level]);
freqIndex[level-1].copyFrom(freqIndex[level]);
}
docIndex[level-1].set(docIndex[level]);
docIndex[level-1].copyFrom(docIndex[level]);
if (posIndex != null) {
posIndex[level-1].set(posIndex[level]);
posIndex[level-1].copyFrom(posIndex[level]);
}
}
}

2
lucene/test-framework/src/java/org/apache/lucene/codecs/mocksep/MockSingleIntIndexInput.java
View File

@ -84,7 +84,7 @@ public class MockSingleIntIndexInput extends IntIndexInput {
}
@Override
public void set(IntIndexInput.Index other) {
public void copyFrom(IntIndexInput.Index other) {
fp = ((MockSingleIntIndexInputIndex) other).fp;
}