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

LUCENE-6039: a few more null checks 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1635807 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael McCandless 2014-10-31 16:32:30 +00:00
parent bc41d58cd3
commit ea5aa39e23
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lucene/core/src/java/org/apache/lucene/index/DefaultIndexingChain.java
View File

@ -379,6 +379,9 @@ final class DefaultIndexingChain extends DocConsumer {
} }
private static void verifyFieldType(String name, IndexableFieldType ft) { private static void verifyFieldType(String name, IndexableFieldType ft) {
if (ft.indexOptions() == null) {
throw new NullPointerException("IndexOptions must not be null (field: \"" + name + "\")");
}
if (ft.indexOptions() == IndexOptions.NO) { if (ft.indexOptions() == IndexOptions.NO) {
if (ft.storeTermVectors()) { if (ft.storeTermVectors()) {
throw new IllegalArgumentException("cannot store term vectors " throw new IllegalArgumentException("cannot store term vectors "

25
lucene/core/src/java/org/apache/lucene/index/FieldInfo.java
View File

@ -34,7 +34,7 @@ public final class FieldInfo {
/** Internal field number */ /** Internal field number */
public final int number; public final int number;
private DocValuesType docValueType = DocValuesType.NO; private DocValuesType docValuesType = DocValuesType.NO;
// True if any document indexed term vectors // True if any document indexed term vectors
private boolean storeTermVector; private boolean storeTermVector;
@ -56,14 +56,14 @@ public final class FieldInfo {
boolean storePayloads, IndexOptions indexOptions, DocValuesType docValues, boolean storePayloads, IndexOptions indexOptions, DocValuesType docValues,
long dvGen, Map<String,String> attributes) { long dvGen, Map<String,String> attributes) {
if (docValues == null) { if (docValues == null) {
throw new NullPointerException("DocValuesType cannot be null"); throw new NullPointerException("DocValuesType cannot be null (field: \"" + name + "\")");
} }
if (indexOptions == null) { if (indexOptions == null) {
throw new NullPointerException("IndexOptions cannot be null"); throw new NullPointerException("IndexOptions cannot be null (field: \"" + name + "\")");
} }
this.name = name; this.name = name;
this.number = number; this.number = number;
this.docValueType = docValues; this.docValuesType = docValues;
this.indexOptions = indexOptions; this.indexOptions = indexOptions;
if (indexOptions != IndexOptions.NO) { if (indexOptions != IndexOptions.NO) {
this.storeTermVector = storeTermVector; this.storeTermVector = storeTermVector;
@ -101,7 +101,7 @@ public final class FieldInfo {
} }
} }
if (dvGen != -1 && docValueType == null) { if (dvGen != -1 && docValuesType == DocValuesType.NO) {
throw new IllegalStateException("field '" + name + "' cannot have a docvalues update generation without having docvalues"); throw new IllegalStateException("field '" + name + "' cannot have a docvalues update generation without having docvalues");
} }
@ -115,7 +115,7 @@ public final class FieldInfo {
// should only be called by FieldInfos#addOrUpdate // should only be called by FieldInfos#addOrUpdate
void update(boolean storeTermVector, boolean omitNorms, boolean storePayloads, IndexOptions indexOptions) { void update(boolean storeTermVector, boolean omitNorms, boolean storePayloads, IndexOptions indexOptions) {
if (indexOptions == null) { if (indexOptions == null) {
throw new NullPointerException("IndexOptions cannot be null"); throw new NullPointerException("IndexOptions cannot be null (field: \"" + name + "\")");
} }
//System.out.println("FI.update field=" + name + " indexed=" + indexed + " omitNorms=" + omitNorms + " this.omitNorms=" + this.omitNorms); //System.out.println("FI.update field=" + name + " indexed=" + indexed + " omitNorms=" + omitNorms + " this.omitNorms=" + this.omitNorms);
if (this.indexOptions != indexOptions) { if (this.indexOptions != indexOptions) {
@ -144,10 +144,13 @@ public final class FieldInfo {
} }
void setDocValuesType(DocValuesType type) { void setDocValuesType(DocValuesType type) {
if (docValueType != DocValuesType.NO && docValueType != type) { if (type == null) {
throw new IllegalArgumentException("cannot change DocValues type from " + docValueType + " to " + type + " for field \"" + name + "\""); throw new NullPointerException("DocValuesType cannot be null (field: \"" + name + "\")");
} }
docValueType = type; if (docValuesType != DocValuesType.NO && docValuesType != type) {
throw new IllegalArgumentException("cannot change DocValues type from " + docValuesType + " to " + type + " for field \"" + name + "\"");
}
docValuesType = type;
assert checkConsistency(); assert checkConsistency();
} }
@ -160,7 +163,7 @@ public final class FieldInfo {
* Returns true if this field has any docValues. * Returns true if this field has any docValues.
*/ */
public boolean hasDocValues() { public boolean hasDocValues() {
return docValueType != DocValuesType.NO; return docValuesType != DocValuesType.NO;
} }
/** /**
@ -168,7 +171,7 @@ public final class FieldInfo {
* {@code DocValuesType.NO} if the field has no docvalues. * {@code DocValuesType.NO} if the field has no docvalues.
*/ */
public DocValuesType getDocValuesType() { public DocValuesType getDocValuesType() {
return docValueType; return docValuesType;
} }
/** Sets the docValues generation of this field. */ /** Sets the docValues generation of this field. */