lucene 4: field visitors shouldn't return fields that were not present in the visited document

Author: imotov

src/main/java/org/elasticsearch/index/mapper/internal/SourceFieldVisitor.java

@@ -50,7 +50,9 @@ public void binaryField(FieldInfo fieldInfo, byte[] value) throws IOException {
  @Override
  public Document createDocument() {
  Document document = new Document();
- document.add(new StoredField(SourceFieldMapper.NAME, source));
+ if (source != null) {
+ document.add(new StoredField(SourceFieldMapper.NAME, source));
+ }
  return document;
  }
 

src/main/java/org/elasticsearch/index/mapper/selector/UidAndRoutingFieldVisitor.java

@@ -40,8 +40,12 @@ public class UidAndRoutingFieldVisitor extends BaseFieldVisitor {
  @Override
  public Document createDocument() {
  Document document = new Document();
- document.add(new StoredField(UidFieldMapper.NAME, uid));
- document.add(new StoredField(SourceFieldMapper.NAME, routing));
+ if (uid != null) {
+ document.add(new StoredField(UidFieldMapper.NAME, uid));
+ }
+ if (routing != null) {
+ document.add(new StoredField(SourceFieldMapper.NAME, routing));
+ }
  return document;
  }
 

src/main/java/org/elasticsearch/index/mapper/selector/UidAndSourceFieldVisitor.java

@@ -40,8 +40,12 @@ public class UidAndSourceFieldVisitor extends BaseFieldVisitor {
  @Override
  public Document createDocument() {
  Document document = new Document();
- document.add(new StoredField(UidFieldMapper.NAME, uid));
- document.add(new StoredField(SourceFieldMapper.NAME, source));
+ if (uid != null) {
+ document.add(new StoredField(UidFieldMapper.NAME, uid));
+ }
+ if (source != null) {
+ document.add(new StoredField(SourceFieldMapper.NAME, source));
+ }
  return document;
  }
 

src/main/java/org/elasticsearch/index/mapper/selector/UidFieldVisitor.java

@@ -53,7 +53,9 @@ public Status needsField(FieldInfo fieldInfo) throws IOException {
  @Override
  public Document createDocument() {
  Document document = new Document();
- document.add(new StoredField(UidFieldMapper.NAME, uid));
+ if (uid != null) {
+ document.add(new StoredField(UidFieldMapper.NAME, uid));
+ }
  return document;
  }