Remove index name from mapping parser

core/src/main/java/org/elasticsearch/action/bulk/TransportShardBulkAction.java

@@ -457,7 +457,7 @@ protected void shardOperationOnReplica(ShardId shardId, BulkShardRequest request
             if (item.request() instanceof IndexRequest) {
                 IndexRequest indexRequest = (IndexRequest) item.request();
                 try {
-                    SourceToParse sourceToParse = SourceToParse.source(SourceToParse.Origin.REPLICA, indexRequest.source()).type(indexRequest.type()).id(indexRequest.id())
+                    SourceToParse sourceToParse = SourceToParse.source(SourceToParse.Origin.REPLICA, indexRequest.source()).index(shardId.getIndex()).type(indexRequest.type()).id(indexRequest.id())
                             .routing(indexRequest.routing()).parent(indexRequest.parent()).timestamp(indexRequest.timestamp()).ttl(indexRequest.ttl());
 
                     final Engine.IndexingOperation operation;

core/src/main/java/org/elasticsearch/action/index/TransportIndexAction.java

@@ -180,7 +180,7 @@ protected Tuple<IndexResponse, IndexRequest> shardOperationOnPrimary(ClusterStat
     protected void shardOperationOnReplica(ShardId shardId, IndexRequest request) {
         IndexService indexService = indicesService.indexServiceSafe(shardId.getIndex());
         IndexShard indexShard = indexService.shardSafe(shardId.id());
-        SourceToParse sourceToParse = SourceToParse.source(SourceToParse.Origin.REPLICA, request.source()).type(request.type()).id(request.id())
+        SourceToParse sourceToParse = SourceToParse.source(SourceToParse.Origin.REPLICA, request.source()).index(shardId.getIndex()).type(request.type()).id(request.id())
                 .routing(request.routing()).parent(request.parent()).timestamp(request.timestamp()).ttl(request.ttl());
 
         final Engine.IndexingOperation operation;

core/src/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java

@@ -1048,7 +1048,7 @@ public void close() {
     /** Utility method to create either an index or a create operation depending
      *  on the {@link OpType} of the request. */
     private final Engine.IndexingOperation prepareIndexOperationOnPrimary(BulkShardRequest shardRequest, IndexRequest request, IndexShard indexShard) {
-        SourceToParse sourceToParse = SourceToParse.source(SourceToParse.Origin.PRIMARY, request.source()).type(request.type()).id(request.id())
+        SourceToParse sourceToParse = SourceToParse.source(SourceToParse.Origin.PRIMARY, request.source()).index(request.index()).type(request.type()).id(request.id())
                 .routing(request.routing()).parent(request.parent()).timestamp(request.timestamp()).ttl(request.ttl());
         boolean canHaveDuplicates = request.canHaveDuplicates();
         if (shardRequest != null) {

core/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java

@@ -84,8 +84,6 @@ public static class Builder {
 
         private List<SourceTransform> sourceTransforms = new ArrayList<>(1);
 
-        private final String index;
-
         private final Settings indexSettings;
 
         private final RootObjectMapper rootObjectMapper;
@@ -94,8 +92,7 @@ public static class Builder {
 
         private final Mapper.BuilderContext builderContext;
 
-        public Builder(String index, Settings indexSettings, RootObjectMapper.Builder builder, MapperService mapperService) {
-            this.index = index;
+        public Builder(Settings indexSettings, RootObjectMapper.Builder builder, MapperService mapperService) {
             this.indexSettings = indexSettings;
             this.builderContext = new Mapper.BuilderContext(indexSettings, new ContentPath(1));
             this.rootObjectMapper = builder.build(builderContext);
@@ -150,7 +147,7 @@ public Builder transform(ScriptService scriptService, String script, ScriptType
 
         public DocumentMapper build(MapperService mapperService, DocumentMapperParser docMapperParser) {
             Preconditions.checkNotNull(rootObjectMapper, "Mapper builder must have the root object mapper set");
-            return new DocumentMapper(mapperService, index, indexSettings, docMapperParser, rootObjectMapper, meta, rootMappers, sourceTransforms, mapperService.mappingLock);
+            return new DocumentMapper(mapperService, indexSettings, docMapperParser, rootObjectMapper, meta, rootMappers, sourceTransforms, mapperService.mappingLock);
         }
     }
 
@@ -176,7 +173,7 @@ public DocumentMapper build(MapperService mapperService, DocumentMapperParser do
     private final ReleasableLock mappingWriteLock;
     private final ReentrantReadWriteLock mappingLock;
 
-    public DocumentMapper(MapperService mapperService, String index, @Nullable Settings indexSettings, DocumentMapperParser docMapperParser,
+    public DocumentMapper(MapperService mapperService, @Nullable Settings indexSettings, DocumentMapperParser docMapperParser,
                           RootObjectMapper rootObjectMapper,
                           ImmutableMap<String, Object> meta,
                           Map<Class<? extends MetadataFieldMapper>, MetadataFieldMapper> rootMappers,
@@ -191,7 +188,7 @@ public DocumentMapper(MapperService mapperService, String index, @Nullable Setti
                 rootMappers.values().toArray(new MetadataFieldMapper[rootMappers.values().size()]),
                 sourceTransforms.toArray(new SourceTransform[sourceTransforms.size()]),
                 meta);
-        this.documentParser = new DocumentParser(index, indexSettings, docMapperParser, this, new ReleasableLock(mappingLock.readLock()));
+        this.documentParser = new DocumentParser(indexSettings, docMapperParser, this, new ReleasableLock(mappingLock.readLock()));
 
         this.typeFilter = typeMapper().fieldType().termQuery(type, null);
         this.mappingWriteLock = new ReleasableLock(mappingLock.writeLock());
@@ -325,8 +322,8 @@ public ImmutableMap<String, ObjectMapper> objectMappers() {
         return this.objectMappers;
     }
 
-    public ParsedDocument parse(String type, String id, BytesReference source) throws MapperParsingException {
-        return parse(SourceToParse.source(source).type(type).id(id));
+    public ParsedDocument parse(String index, String type, String id, BytesReference source) throws MapperParsingException {
+        return parse(SourceToParse.source(source).index(index).type(type).id(id));
     }
 
     public ParsedDocument parse(SourceToParse source) throws MapperParsingException {

core/src/main/java/org/elasticsearch/index/mapper/DocumentMapperParser.java

@@ -56,11 +56,9 @@
 
 import static org.elasticsearch.index.mapper.MapperBuilders.doc;
 
-/**
- *
- */
-public class DocumentMapperParser extends AbstractIndexComponent {
+public class DocumentMapperParser {
 
+    private final Settings indexSettings;
     final MapperService mapperService;
     final AnalysisService analysisService;
     private static final ESLogger logger = Loggers.getLogger(DocumentMapperParser.class);
@@ -76,9 +74,9 @@ public class DocumentMapperParser extends AbstractIndexComponent {
     private volatile ImmutableMap<String, Mapper.TypeParser> typeParsers;
     private volatile ImmutableMap<String, Mapper.TypeParser> rootTypeParsers;
 
-    public DocumentMapperParser(Index index, @IndexSettings Settings indexSettings, MapperService mapperService, AnalysisService analysisService,
+    public DocumentMapperParser(@IndexSettings Settings indexSettings, MapperService mapperService, AnalysisService analysisService,
                                 SimilarityLookupService similarityLookupService, ScriptService scriptService) {
-        super(index, indexSettings);
+        this.indexSettings = indexSettings;
         this.parseFieldMatcher = new ParseFieldMatcher(indexSettings);
         this.mapperService = mapperService;
         this.analysisService = analysisService;
@@ -205,7 +203,7 @@ private DocumentMapper parse(String type, Map<String, Object> mapping, String de
 
         Mapper.TypeParser.ParserContext parserContext = parserContext();
         // parse RootObjectMapper
-        DocumentMapper.Builder docBuilder = doc(index.name(), indexSettings, (RootObjectMapper.Builder) rootObjectTypeParser.parse(type, mapping, parserContext), mapperService);
+        DocumentMapper.Builder docBuilder = doc(indexSettings, (RootObjectMapper.Builder) rootObjectTypeParser.parse(type, mapping, parserContext), mapperService);
         Iterator<Map.Entry<String, Object>> iterator = mapping.entrySet().iterator();
         // parse DocumentMapper
         while(iterator.hasNext()) {

core/src/main/java/org/elasticsearch/index/mapper/DocumentParser.java

@@ -56,18 +56,16 @@ class DocumentParser implements Closeable {
     private CloseableThreadLocal<ParseContext.InternalParseContext> cache = new CloseableThreadLocal<ParseContext.InternalParseContext>() {
         @Override
         protected ParseContext.InternalParseContext initialValue() {
-            return new ParseContext.InternalParseContext(index, indexSettings, docMapperParser, docMapper, new ContentPath(0));
+            return new ParseContext.InternalParseContext(indexSettings, docMapperParser, docMapper, new ContentPath(0));
         }
     };
 
-    private final String index;
     private final Settings indexSettings;
     private final DocumentMapperParser docMapperParser;
     private final DocumentMapper docMapper;
     private final ReleasableLock parseLock;
 
-    public DocumentParser(String index, Settings indexSettings, DocumentMapperParser docMapperParser, DocumentMapper docMapper, ReleasableLock parseLock) {
-        this.index = index;
+    public DocumentParser(Settings indexSettings, DocumentMapperParser docMapperParser, DocumentMapper docMapper, ReleasableLock parseLock) {
         this.indexSettings = indexSettings;
         this.docMapperParser = docMapperParser;
         this.docMapper = docMapper;

core/src/main/java/org/elasticsearch/index/mapper/MapperBuilders.java

@@ -32,8 +32,8 @@ public final class MapperBuilders {
 
     private MapperBuilders() {}
 
-    public static DocumentMapper.Builder doc(String index, Settings settings, RootObjectMapper.Builder objectBuilder, MapperService mapperService) {
-        return new DocumentMapper.Builder(index, settings, objectBuilder, mapperService);
+    public static DocumentMapper.Builder doc(Settings settings, RootObjectMapper.Builder objectBuilder, MapperService mapperService) {
+        return new DocumentMapper.Builder(settings, objectBuilder, mapperService);
     }
 
     public static RootObjectMapper.Builder rootObject(String name) {

core/src/main/java/org/elasticsearch/index/mapper/MapperService.java

@@ -146,7 +146,7 @@ public MapperService(Index index, @IndexSettings Settings indexSettings, Analysi
         this.analysisService = analysisService;
         this.fieldDataService = fieldDataService;
         this.fieldTypes = new FieldTypeLookup();
-        this.documentParser = new DocumentMapperParser(index, indexSettings, this, analysisService, similarityLookupService, scriptService);
+        this.documentParser = new DocumentMapperParser(indexSettings, this, analysisService, similarityLookupService, scriptService);
         this.indexAnalyzer = new MapperAnalyzerWrapper(analysisService.defaultIndexAnalyzer(), INDEX_ANALYZER_EXTRACTOR);
         this.searchAnalyzer = new MapperAnalyzerWrapper(analysisService.defaultSearchAnalyzer(), SEARCH_ANALYZER_EXTRACTOR);
         this.searchQuoteAnalyzer = new MapperAnalyzerWrapper(analysisService.defaultSearchQuoteAnalyzer(), SEARCH_QUOTE_ANALYZER_EXTRACTOR);

core/src/main/java/org/elasticsearch/index/mapper/ParseContext.java

@@ -380,8 +380,6 @@ public static class InternalParseContext extends ParseContext {
 
         private List<Document> documents = Lists.newArrayList();
 
-        private final String index;
-
         @Nullable
         private final Settings indexSettings;
 
@@ -402,8 +400,7 @@ public static class InternalParseContext extends ParseContext {
 
         private Mapper dynamicMappingsUpdate = null;
 
-        public InternalParseContext(String index, @Nullable Settings indexSettings, DocumentMapperParser docMapperParser, DocumentMapper docMapper, ContentPath path) {
-            this.index = index;
+        public InternalParseContext(@Nullable Settings indexSettings, DocumentMapperParser docMapperParser, DocumentMapper docMapper, ContentPath path) {
             this.indexSettings = indexSettings;
             this.docMapper = docMapper;
             this.docMapperParser = docMapperParser;
@@ -443,7 +440,7 @@ public DocumentMapperParser docMapperParser() {
 
         @Override
         public String index() {
-            return this.index;
+            return sourceToParse.index();
         }
 
         @Override

core/src/main/java/org/elasticsearch/index/mapper/SourceToParse.java

@@ -47,6 +47,8 @@ public static SourceToParse source(Origin origin, BytesReference source) {
 
     private boolean flyweight = false;
 
+    private String index;
+
     private String type;
 
     private String id;
@@ -59,13 +61,13 @@ public static SourceToParse source(Origin origin, BytesReference source) {
 
     private long ttl;
 
-    public SourceToParse(Origin origin, XContentParser parser) {
+    private SourceToParse(Origin origin, XContentParser parser) {
         this.origin = origin;
         this.parser = parser;
         this.source = null;
     }
 
-    public SourceToParse(Origin origin, BytesReference source) {
+    private SourceToParse(Origin origin, BytesReference source) {
         this.origin = origin;
         // we always convert back to byte array, since we store it and Field only supports bytes..
         // so, we might as well do it here, and improve the performance of working with direct byte arrays
@@ -85,6 +87,15 @@ public BytesReference source() {
         return this.source;
     }
 
+    public String index() {
+        return this.index;
+    }
+
+    public SourceToParse index(String index) {
+        this.index = index;
+        return this;
+    }
+
     public String type() {
         return this.type;
     }

core/src/main/java/org/elasticsearch/index/shard/TranslogRecoveryPerformer.java

@@ -145,7 +145,7 @@ public void performRecoveryOperation(Engine engine, Translog.Operation operation
                 case CREATE:
                     Translog.Create create = (Translog.Create) operation;
                     Engine.Create engineCreate = IndexShard.prepareCreate(docMapper(create.type()),
-                            source(create.source()).type(create.type()).id(create.id())
+                            source(create.source()).index(shardId.getIndex()).type(create.type()).id(create.id())
                                     .routing(create.routing()).parent(create.parent()).timestamp(create.timestamp()).ttl(create.ttl()),
                             create.version(), create.versionType().versionTypeForReplicationAndRecovery(), Engine.Operation.Origin.RECOVERY, true, false);
                     maybeAddMappingUpdate(engineCreate.type(), engineCreate.parsedDoc().dynamicMappingsUpdate(), engineCreate.id(), allowMappingUpdates);

core/src/main/java/org/elasticsearch/index/termvectors/ShardTermVectorsService.java

@@ -309,7 +309,7 @@ private ParsedDocument parseDocument(String index, String type, BytesReference d
 
         // TODO: make parsing not dynamically create fields not in the original mapping
         Tuple<DocumentMapper, Mapping> docMapper = mapperService.documentMapperWithAutoCreate(type);
-        ParsedDocument parsedDocument = docMapper.v1().parse(source(doc).type(type).flyweight(true));
+        ParsedDocument parsedDocument = docMapper.v1().parse(source(doc).index(index).type(type).flyweight(true));
         if (docMapper.v2() != null) {
             parsedDocument.addDynamicMappingsUpdate(docMapper.v2());
         }

core/src/main/java/org/elasticsearch/percolator/PercolatorService.java

@@ -182,13 +182,13 @@ public PercolateShardResponse percolate(PercolateShardRequest request) {
         );
         SearchContext.setCurrent(context);
         try {
-            ParsedDocument parsedDocument = parseRequest(percolateIndexService, request, context);
+            ParsedDocument parsedDocument = parseRequest(percolateIndexService, request, context, request.shardId().getIndex());
             if (context.percolateQueries().isEmpty()) {
                 return new PercolateShardResponse(context, request.shardId());
             }
 
             if (request.docSource() != null && request.docSource().length() != 0) {
-                parsedDocument = parseFetchedDoc(context, request.docSource(), percolateIndexService, request.documentType());
+                parsedDocument = parseFetchedDoc(context, request.docSource(), percolateIndexService, request.shardId().getIndex(), request.documentType());
             } else if (parsedDocument == null) {
                 throw new IllegalArgumentException("Nothing to percolate");
             }
@@ -242,7 +242,7 @@ public PercolateShardResponse percolate(PercolateShardRequest request) {
         }
     }
 
-    private ParsedDocument parseRequest(IndexService documentIndexService, PercolateShardRequest request, PercolateContext context) {
+    private ParsedDocument parseRequest(IndexService documentIndexService, PercolateShardRequest request, PercolateContext context, String index) {
         BytesReference source = request.source();
         if (source == null || source.length() == 0) {
             return null;
@@ -276,7 +276,7 @@ private ParsedDocument parseRequest(IndexService documentIndexService, Percolate
 
                         MapperService mapperService = documentIndexService.mapperService();
                         Tuple<DocumentMapper, Mapping> docMapper = mapperService.documentMapperWithAutoCreate(request.documentType());
-                        doc = docMapper.v1().parse(source(parser).type(request.documentType()).flyweight(true));
+                        doc = docMapper.v1().parse(source(parser).index(index).type(request.documentType()).flyweight(true));
                         if (docMapper.v2() != null) {
                             doc.addDynamicMappingsUpdate(docMapper.v2());
                         }
@@ -378,14 +378,14 @@ private void parseSort(XContentParser parser, PercolateContext context) throws E
         }
     }
 
-    private ParsedDocument parseFetchedDoc(PercolateContext context, BytesReference fetchedDoc, IndexService documentIndexService, String type) {
+    private ParsedDocument parseFetchedDoc(PercolateContext context, BytesReference fetchedDoc, IndexService documentIndexService, String index, String type) {
         ParsedDocument doc = null;
         XContentParser parser = null;
         try {
             parser = XContentFactory.xContent(fetchedDoc).createParser(fetchedDoc);
             MapperService mapperService = documentIndexService.mapperService();
             Tuple<DocumentMapper, Mapping> docMapper = mapperService.documentMapperWithAutoCreate(type);
-            doc = docMapper.v1().parse(source(parser).type(type).flyweight(true));
+            doc = docMapper.v1().parse(source(parser).index(index).type(type).flyweight(true));
 
             if (context.highlight() != null) {
                 doc.setSource(fetchedDoc);

core/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java

@@ -1924,8 +1924,8 @@ public TranslogHandler(String indexName) {
             AnalysisService analysisService = new AnalysisService(index, settings);
             SimilarityLookupService similarityLookupService = new SimilarityLookupService(index, settings);
             MapperService mapperService = new MapperService(index, settings, analysisService, null, similarityLookupService, null);
-            DocumentMapper.Builder b = new DocumentMapper.Builder(indexName, settings, rootBuilder, mapperService);
-            DocumentMapperParser parser = new DocumentMapperParser(index, settings, mapperService, analysisService, similarityLookupService, null);
+            DocumentMapper.Builder b = new DocumentMapper.Builder(settings, rootBuilder, mapperService);
+            DocumentMapperParser parser = new DocumentMapperParser(settings, mapperService, analysisService, similarityLookupService, null);
             this.docMapper = b.build(mapperService, parser);
 
         }