honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change includes/excludes back to null based for now, since it 

complicates serialization and causes a number of test failures.
This commit is contained in:
Ryan Ernst 2015-05-14 14:57:09 -07:00
parent a6b0f0a8c1
commit 7cacfa0769
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/org/elasticsearch/index/mapper/internal/SourceFieldMapper.java
View File

@ -222,8 +222,8 @@ public class SourceFieldMapper extends AbstractFieldMapper<byte[]> implements Ro
this.enabled = enabled; this.enabled = enabled;
this.compress = compress; this.compress = compress;
this.compressThreshold = compressThreshold; this.compressThreshold = compressThreshold;
this.includes = includes == null ? Strings.EMPTY_ARRAY : includes; this.includes = includes;
this.excludes = excludes == null ? Strings.EMPTY_ARRAY : excludes; this.excludes = excludes;
this.format = format; this.format = format;
this.formatContentType = format == null ? null : XContentType.fromRestContentType(format); this.formatContentType = format == null ? null : XContentType.fromRestContentType(format);
this.complete = enabled && includes == null && excludes == null; this.complete = enabled && includes == null && excludes == null;
@ -234,12 +234,12 @@ public class SourceFieldMapper extends AbstractFieldMapper<byte[]> implements Ro
} }
public String[] excludes() { public String[] excludes() {
return excludes; return this.excludes != null ? this.excludes : Strings.EMPTY_ARRAY;
} }
public String[] includes() { public String[] includes() {
return includes; return this.includes != null ? this.includes : Strings.EMPTY_ARRAY;
} }
public boolean isComplete() { public boolean isComplete() {
@ -433,10 +433,10 @@ public class SourceFieldMapper extends AbstractFieldMapper<byte[]> implements Ro
if (this.enabled != sourceMergeWith.enabled) { if (this.enabled != sourceMergeWith.enabled) {
mergeResult.addConflict("Cannot update enabled setting for [_source]"); mergeResult.addConflict("Cannot update enabled setting for [_source]");
} }
if (Arrays.equals(includes, sourceMergeWith.includes) == false) { if (Arrays.equals(includes(), sourceMergeWith.includes()) == false) {
mergeResult.addConflict("Cannot update includes setting for [_source]"); mergeResult.addConflict("Cannot update includes setting for [_source]");
} }
if (Arrays.equals(excludes, sourceMergeWith.excludes) == false) { if (Arrays.equals(excludes(), sourceMergeWith.excludes()) == false) {
mergeResult.addConflict("Cannot update excludes setting for [_source]"); mergeResult.addConflict("Cannot update excludes setting for [_source]");
} }
} else { } else {