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

Default mapping means new types not mapped explicitly, closes #1524.

This commit is contained in:
Shay Banon 2011-12-07 23:17:27 +02:00
parent 6632f8cb56
commit df9f333a27
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java
View File

@ -252,6 +252,8 @@ public class DocumentMapper implements ToXContent {
private final Object mutex = new Object(); private final Object mutex = new Object();
private boolean initMappersAdded = true;
public DocumentMapper(String index, @Nullable Settings indexSettings, DocumentMapperParser docMapperParser, public DocumentMapper(String index, @Nullable Settings indexSettings, DocumentMapperParser docMapperParser,
RootObjectMapper rootObjectMapper, RootObjectMapper rootObjectMapper,
ImmutableMap<String, Object> meta, ImmutableMap<String, Object> meta,
@ -429,6 +431,11 @@ public class DocumentMapper implements ToXContent {
parser = XContentHelper.createParser(source.source(), source.sourceOffset(), source.sourceLength()); parser = XContentHelper.createParser(source.source(), source.sourceOffset(), source.sourceLength());
} }
context.reset(parser, new Document(), source, listener); context.reset(parser, new Document(), source, listener);
// on a newly created instance of document mapper, we always consider it as new mappers that have been added
if (initMappersAdded) {
context.addedMapper();
initMappersAdded = false;
}
// will result in START_OBJECT // will result in START_OBJECT
int countDownTokens = 0; int countDownTokens = 0;