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

LUCENE-4055: clean up some nocommits 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene4055@1341628 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Muir 2012-05-22 21:12:37 +00:00
parent ae439f4929
commit ffb88a89ef
5 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lucene/core/src/java/org/apache/lucene/codecs/lucene3x/TermBuffer.java
View File

@ -67,7 +67,7 @@ final class TermBuffer implements Cloneable {
final int fieldNumber = input.readVInt(); final int fieldNumber = input.readVInt();
if (fieldNumber != currentFieldNumber) { if (fieldNumber != currentFieldNumber) {
currentFieldNumber = fieldNumber; currentFieldNumber = fieldNumber;
// nocommit: too much sneakiness here, seriously this is a negative vint?! // NOTE: too much sneakiness here, seriously this is a negative vint?!
if (currentFieldNumber == -1) { if (currentFieldNumber == -1) {
field = ""; field = "";
} else { } else {

5
lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40PostingsWriter.java
View File

@ -103,8 +103,9 @@ public final class Lucene40PostingsWriter extends PostingsWriterBase {
freqOut = state.directory.createOutput(fileName, state.context); freqOut = state.directory.createOutput(fileName, state.context);
boolean success = false; boolean success = false;
try { try {
// nocommit this isn't quite right: it should be only // TODO: this is a best effort, if one of these fields has no postings
// the fields indexed by us...? maybe... we shouldn't // then we make an empty prx file, same as if we are wrapped in
// per-field postingsformat. maybe... we shouldn't
// bother w/ this opto? just create empty prx file...? // bother w/ this opto? just create empty prx file...?
if (state.fieldInfos.hasProx()) { if (state.fieldInfos.hasProx()) {
// At least one field does not omit TF, so create the // At least one field does not omit TF, so create the

2
lucene/core/src/java/org/apache/lucene/index/FieldInfos.java
View File

@ -243,7 +243,7 @@ public class FieldInfos implements Iterable<FieldInfo> {
* @param storePayloads true if payloads should be stored for this field * @param storePayloads true if payloads should be stored for this field
* @param indexOptions if term freqs should be omitted for this field * @param indexOptions if term freqs should be omitted for this field
*/ */
// nocommit: fix testCodecs to do this another way, its the only user of this // TODO: fix testCodecs to do this another way, its the only user of this
FieldInfo addOrUpdate(String name, boolean isIndexed, boolean storeTermVector, FieldInfo addOrUpdate(String name, boolean isIndexed, boolean storeTermVector,
boolean omitNorms, boolean storePayloads, IndexOptions indexOptions, DocValues.Type docValues, DocValues.Type normType) { boolean omitNorms, boolean storePayloads, IndexOptions indexOptions, DocValues.Type docValues, DocValues.Type normType) {
return addOrUpdateInternal(name, -1, isIndexed, storeTermVector, omitNorms, storePayloads, indexOptions, docValues, normType); return addOrUpdateInternal(name, -1, isIndexed, storeTermVector, omitNorms, storePayloads, indexOptions, docValues, normType);

4
lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java
View File

@ -350,10 +350,6 @@ public final class SegmentInfos implements Cloneable, Iterable<SegmentInfoPerCom
ChecksumIndexOutput segnOutput = null; ChecksumIndexOutput segnOutput = null;
boolean success = false; boolean success = false;
// nocommit document somewhere that we store this
// list-of-segs plus delGen plus other stuff
// "generically" and then codec gets to write SI
final Set<String> upgradedSIFiles = new HashSet<String>(); final Set<String> upgradedSIFiles = new HashSet<String>();
try { try {

2
lucene/test-framework/src/java/org/apache/lucene/codecs/lucene3x/TermInfosWriter.java
View File

@ -156,7 +156,7 @@ final class TermInfosWriter implements Closeable {
return true; return true;
} }
// nocommit: temporary hacknuke this. /** note: -1 is the empty field: "" !!!! */
static String fieldName(FieldInfos infos, int fieldNumber) { static String fieldName(FieldInfos infos, int fieldNumber) {
FieldInfo fi = infos.fieldInfo(fieldNumber); FieldInfo fi = infos.fieldInfo(fieldNumber);
return (fi != null) ? fi.name : ""; return (fi != null) ? fi.name : "";