From cf570ac5bde062de026773139093d2f2ed46041e Mon Sep 17 00:00:00 2001
From: javanna <cavannaluca@gmail.com>
Date: Fri, 24 Jul 2015 18:37:17 +0200
Subject: [PATCH] Query DSL: don't cache type filter in DocumentMapper

If we cache the type filter and we e.g. set its boost which is now settable on all queries, the boost will change for all subsequent queries. We should rather create a new query every time.
---
 .../java/org/elasticsearch/index/mapper/DocumentMapper.java  | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/core/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java
index 989f1f2c813..1fbd0f2a36c 100644
--- a/core/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java
+++ b/core/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java
@@ -168,8 +168,6 @@ public class DocumentMapper implements ToXContent {
 
     private boolean hasNestedObjects = false;
 
-    private final Query typeFilter;
-
     private final ReleasableLock mappingWriteLock;
     private final ReentrantReadWriteLock mappingLock;
 
@@ -190,7 +188,6 @@ public class DocumentMapper implements ToXContent {
                 meta);
         this.documentParser = new DocumentParser(indexSettings, docMapperParser, this, new ReleasableLock(mappingLock.readLock()));
 
-        this.typeFilter = typeMapper().fieldType().termQuery(type, null);
         this.mappingWriteLock = new ReleasableLock(mappingLock.writeLock());
         this.mappingLock = mappingLock;
 
@@ -307,7 +304,7 @@ public class DocumentMapper implements ToXContent {
     }
 
     public Query typeFilter() {
-        return this.typeFilter;
+        return typeMapper().fieldType().termQuery(type, null);
     }
 
     public boolean hasNestedObjects() {